diff options
| author | Adrian Bunk | 2007-12-18 18:05:58 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2007-12-18 18:05:58 +0100 |
| commit | b4be625852618636a6b54908c4f9d90fb29dc549 (patch) | |
| tree | 87c8f5f83b059ab839ce11dcc5e17f5fb12b0723 /kernel | |
| parent | genirq: add unlocked version of set_irq_handler() (diff) | |
| download | kernel-qcow2-linux-b4be625852618636a6b54908c4f9d90fb29dc549.tar.gz kernel-qcow2-linux-b4be625852618636a6b54908c4f9d90fb29dc549.tar.xz kernel-qcow2-linux-b4be625852618636a6b54908c4f9d90fb29dc549.zip | |
timer: kernel/timer.c section fixes
This patch fixes the following section mismatches with CONFIG_HOTPLUG=n,
CONFIG_HOTPLUG_CPU=y:
...
WARNING: vmlinux.o(.text+0x41cd3): Section mismatch: reference to .init.data:tvec_base_done.22610 (between 'timer_cpu_notify' and 'run_timer_softirq')
WARNING: vmlinux.o(.text+0x41d67): Section mismatch: reference to .init.data:tvec_base_done.22610 (between 'timer_cpu_notify' and 'run_timer_softirq')
...
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index a05817c021d6..d4527dcef1af 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1219,11 +1219,11 @@ asmlinkage long sys_sysinfo(struct sysinfo __user *info) */ static struct lock_class_key base_lock_keys[NR_CPUS]; -static int __devinit init_timers_cpu(int cpu) +static int __cpuinit init_timers_cpu(int cpu) { int j; tvec_base_t *base; - static char __devinitdata tvec_base_done[NR_CPUS]; + static char __cpuinitdata tvec_base_done[NR_CPUS]; if (!tvec_base_done[cpu]) { static char boot_done; |