diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-09-06 09:44:59 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-09-10 09:53:52 +0200 |
| commit | db2e1f43e7b2320d0450fe34e5ac4ac4d8c7708d (patch) | |
| tree | e73d73335870e7a1dd73898d36f246daa30918b9 /arch | |
| parent | s390/cio: invalidate cdev pointer before deregistration (diff) | |
| download | linux-db2e1f43e7b2320d0450fe34e5ac4ac4d8c7708d.tar.xz linux-db2e1f43e7b2320d0450fe34e5ac4ac4d8c7708d.zip | |
s390/hwcaps: do not report high gprs for 31 bit kernel
The bit for high gprs in the AT_HWCAP auxiliary vector field and the
highgprs tag in the output of /proc/cpuinfo should not be set for
31 bit kernels.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index f86c81e13c37..40b57693de38 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -974,11 +974,13 @@ static void __init setup_hwcaps(void) if (MACHINE_HAS_HPAGE) elf_hwcap |= HWCAP_S390_HPAGE; +#if defined(CONFIG_64BIT) /* * 64-bit register support for 31-bit processes * HWCAP_S390_HIGH_GPRS is bit 9. */ elf_hwcap |= HWCAP_S390_HIGH_GPRS; +#endif get_cpu_id(&cpu_id); switch (cpu_id.machine) { |