Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

torvalds · torvalds · commit be3be8905854 · 2008-09-23T14:57:22.000-07:00
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: fix init_hrtick() section mismatch warning
diff --git a/kernel/sched.c b/kernel/sched.c
@@ -1087,7 +1087,7 @@ hotplug_hrtick(struct notifier_block *nfb, unsigned long action, void *hcpu)
 	return NOTIFY_DONE;
 }
 
-static void init_hrtick(void)
+static __init void init_hrtick(void)
 {
 	hotcpu_notifier(hotplug_hrtick, 0);
 }

Original file line number	Diff line number	Diff line change
`@@ -1087,7 +1087,7 @@ hotplug_hrtick(struct notifier_block nfb, unsigned long action, void hcpu)`
`1087`	`1087`	`return NOTIFY_DONE;`
`1088`	`1088`	`}`
`1089`	`1089`
`1090`		`-static void init_hrtick(void)`
	`1090`	`+static __init void init_hrtick(void)`
`1091`	`1091`	`{`
`1092`	`1092`	`hotcpu_notifier(hotplug_hrtick, 0);`
`1093`	`1093`	`}`