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>
This commit is contained in:
Martin Schwidefsky 2012-09-06 09:44:59 +02:00
parent 3368ba25bf
commit db2e1f43e7
1 changed files with 2 additions and 0 deletions

View File

@ -974,11 +974,13 @@ static void __init setup_hwcaps(void)
if (MACHINE_HAS_HPAGE) if (MACHINE_HAS_HPAGE)
elf_hwcap |= HWCAP_S390_HPAGE; elf_hwcap |= HWCAP_S390_HPAGE;
#if defined(CONFIG_64BIT)
/* /*
* 64-bit register support for 31-bit processes * 64-bit register support for 31-bit processes
* HWCAP_S390_HIGH_GPRS is bit 9. * HWCAP_S390_HIGH_GPRS is bit 9.
*/ */
elf_hwcap |= HWCAP_S390_HIGH_GPRS; elf_hwcap |= HWCAP_S390_HIGH_GPRS;
#endif
get_cpu_id(&cpu_id); get_cpu_id(&cpu_id);
switch (cpu_id.machine) { switch (cpu_id.machine) {