From: Catalin Marinas <catalin.marinas@arm.com>
Date: Mon, 10 Apr 2006 20:32:35 +0000 (+0100)
Subject: [ARM] 3470/1: Clear the HWCAP bits for the disabled kernel features
X-Git-Tag: v2.6.17-rc2~284^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=adeff42236aec0601ec979d1a41cd6d9cf5a8c05;p=linux-2.6-omap-h63xx.git

[ARM] 3470/1: Clear the HWCAP bits for the disabled kernel features

Patch from Catalin Marinas

Glibc interprets the HWCAP bits and decides on what features to use.
However, even if the features are present in the hardware, they are not
always supported by the kernel and hence the corresponding bits have to be
cleared from the elf_hwcap variable.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 43752840395..8cff73e668b 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -322,6 +322,12 @@ static void __init setup_processor(void)
 	sprintf(system_utsname.machine, "%s%c", list->arch_name, ENDIANNESS);
 	sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS);
 	elf_hwcap = list->elf_hwcap;
+#ifndef CONFIG_ARM_THUMB
+	elf_hwcap &= ~HWCAP_THUMB;
+#endif
+#ifndef CONFIG_VFP
+	elf_hwcap &= ~HWCAP_VFP;
+#endif
 
 	cpu_proc_init();
 }