Skip to contentSkip to conversation

kernel/timer.c section fixes

PATCH Applied Adrian Bunk 2 participants 2 messages Dec 11, 2007 – Dec 12, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel/timer.c section fixes

This patch fixes the following section mismatches with CONFIG_HOTPLUG=n, CONFIG_HOTPLUG_CPU=y:

<-- snip -->

...
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')
...

<-- snip -->

---
5898f1ca82c5a536b65b3ee26099b67316549664

kernel/timer.c +2 -2
index a05817c..d4527dc 100644
@@ -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;
Applied
#1 lore raw
Quoted 2 lines · Adrian Bunk

This patch fixes the following section mismatches with CONFIG_HOTPLUG=n, CONFIG_HOTPLUG_CPU=y:

thanks, applied.

Ingo