From dcef6054f9656a34506019a111d047d9070c9872 Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Thu, 6 Sep 2012 09:44:59 +0200
Subject: [PATCH] --- yaml --- r: 322994 b: refs/heads/master c:
 db2e1f43e7b2320d0450fe34e5ac4ac4d8c7708d h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/s390/kernel/setup.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d0adbc2540cd..75bc3e9976de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3368ba25bf387109b24732c1e270c628f20e345d
+refs/heads/master: db2e1f43e7b2320d0450fe34e5ac4ac4d8c7708d
diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
index f86c81e13c37..40b57693de38 100644
--- a/trunk/arch/s390/kernel/setup.c
+++ b/trunk/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) {