GIT 981d0f3952c977d799c2bb72e083cb9306ccb797 git+ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master commit Author: Eric Miao Date: Tue Jul 24 01:22:43 2007 +0100 [ARM] 4526/1: pxa: make ARCH_PXA select GENERIC_CLOCKEVENTS make ARCH_PXA select GENERIC_CLOCKEVENTS to fix the building issue due to merge of clockevents based PXA timer Signed-off-by: eric miao Signed-off-by: Russell King commit 5048bcba4d27d975593ef5c55f217aafe015ec3b Author: Russell King Date: Mon Jul 23 12:59:46 2007 +0100 [ARM] setup_profiling_timer must not be __init It's called by writes to /proc/profile, so it must not be marked __init Signed-off-by: Russell King arch/arm/Kconfig | 1 + arch/arm/kernel/smp.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8501631..c8569e8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -341,6 +341,7 @@ config ARCH_PXA select ARCH_MTD_XIP select GENERIC_GPIO select GENERIC_TIME + select GENERIC_CLOCKEVENTS help Support for Intel's PXA2XX processor line. diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 1b76d87..9746e52 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -630,7 +630,7 @@ void smp_send_stop(void) /* * not supported here */ -int __init setup_profiling_timer(unsigned int multiplier) +int setup_profiling_timer(unsigned int multiplier) { return -EINVAL; }