summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-23 14:57:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-23 14:57:22 -0700
commitbe3be8905854d2fcf6030f1da9ebc221e9e2c5f1 (patch)
tree6afd6b79d029702ef68ffd88a7c6f337f88a2f60
parent9c38c7e573ec44e4a10f735c048b40eb00ccc29c (diff)
parentfa748203175de7c08f2df80e5a0eeca40329b5e2 (diff)
downloadop-kernel-dev-be3be8905854d2fcf6030f1da9ebc221e9e2c5f1.zip
op-kernel-dev-be3be8905854d2fcf6030f1da9ebc221e9e2c5f1.tar.gz
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* '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
-rw-r--r--kernel/sched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 9889080..13dd2db 100644
--- 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);
}
OpenPOWER on IntegriCloud