The following commit has been merged in the linux branch: commit be6e3f9cd639fec5882fca16e058843c3064c6c9 Author: Andreas Krebbel Andreas.Krebbel@de.ibm.com Date: Wed Oct 14 12:43:47 2009 +0200

[S390] Add highgprs facility to /proc/cpuinfo

This patch makes the hwcap bit for the high gprs feature to be visible in /proc/cpuinfo.

Signed-off-by: Andreas Krebbel Andreas.Krebbel@de.ibm.com Signed-off-by: Martin Schwidefsky schwidefsky@de.ibm.com

diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c index 802c8ab..0729f36 100644 --- a/arch/s390/kernel/processor.c +++ b/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");