From 37c60d775deb7fdfd26a2d89ba08b50fea43d320 Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Wed, 14 Oct 2009 12:43:47 +0200 Subject: [PATCH] --- yaml --- r: 167478 b: refs/heads/master c: be6e3f9cd639fec5882fca16e058843c3064c6c9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/processor.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 19c8752c64da..d8e3f9f3fb16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7602f6c16b2de2962b279980693ad1b3711e84a +refs/heads/master: be6e3f9cd639fec5882fca16e058843c3064c6c9 diff --git a/trunk/arch/s390/kernel/processor.c b/trunk/arch/s390/kernel/processor.c index 802c8ab247f3..0729f36c2fe3 100644 --- a/trunk/arch/s390/kernel/processor.c +++ b/trunk/arch/s390/kernel/processor.c @@ -31,9 +31,9 @@ void __cpuinit print_cpu_info(void) static int show_cpuinfo(struct seq_file *m, void *v) { - static const char *hwcap_str[9] = { + static const char *hwcap_str[10] = { "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", - "edat", "etf3eh" + "edat", "etf3eh", "highgprs" }; struct _lowcore *lc; unsigned long n = (unsigned long) v - 1; @@ -48,7 +48,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) num_online_cpus(), loops_per_jiffy/(500000/HZ), (loops_per_jiffy/(5000/HZ))%100); seq_puts(m, "features\t: "); - for (i = 0; i < 9; i++) + for (i = 0; i < 10; i++) if (hwcap_str[i] && (elf_hwcap & (1UL << i))) seq_printf(m, "%s ", hwcap_str[i]); seq_puts(m, "\n");