From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 5 Jan 2011 18:08:10 +0000 (+0000)
Subject: Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=31edf274f9aff1ccd39934a0b2fce38f4405c656;p=deliverable%2Flinux.git

Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel
---

31edf274f9aff1ccd39934a0b2fce38f4405c656
diff --cc arch/arm/Kconfig
index d56d21c0573b,a7b9070b661e,f1d9297b1050,f1d9297b1050,03582fd14b87,a19a5266d5fc,6af6c79ade2e,db524e75c4a2,a19a5266d5fc..9d2608363390
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@@@@@@ -6,10 -6,10 -6,10 -6,10 -6,10 -6,10 -6,10 -6,10 -6,10 +6,10 @@@@@@@@@@ config AR
         	select HAVE_MEMBLOCK
         	select RTC_LIB
         	select SYS_SUPPORTS_APM_EMULATION
     -- -	select GENERIC_ATOMIC64 if (!CPU_32v6K)
     ++ +	select GENERIC_ATOMIC64 if (!CPU_32v6K || !AEABI)
         	select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
         	select HAVE_ARCH_KGDB
 -  -----	select HAVE_KPROBES if (!XIP_KERNEL)
 +  +++++	select HAVE_KPROBES if (!XIP_KERNEL && !THUMB2_KERNEL)
         	select HAVE_KRETPROBES if (HAVE_KPROBES)
         	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
         	select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)