Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be3be890 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-fixes-for-linus' of...

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
parents 9c38c7e5 fa748203
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -1087,7 +1087,7 @@ hotplug_hrtick(struct notifier_block *nfb, unsigned long action, void *hcpu)
	return NOTIFY_DONE;
	return NOTIFY_DONE;
}
}


static void init_hrtick(void)
static __init void init_hrtick(void)
{
{
	hotcpu_notifier(hotplug_hrtick, 0);
	hotcpu_notifier(hotplug_hrtick, 0);
}
}