diff --git a/[refs] b/[refs] index 7c9dfbefa1e3..a9d78ba26036 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 554ec22f075d46e4363520a407d2b7eeb5dfdd43 +refs/heads/master: 81d41d7ece23a1c3b4bcd1604026d3a06cc4dc79 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 02a5eeedcb94..f3faec52c5ab 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -1130,6 +1130,7 @@ static enum hrtimer_restart hrtick(struct hrtimer *timer) return HRTIMER_NORESTART; } +#ifdef CONFIG_SMP static void hotplug_hrtick_disable(int cpu) { struct rq *rq = cpu_rq(cpu); @@ -1185,6 +1186,7 @@ static void init_hrtick(void) { hotcpu_notifier(hotplug_hrtick, 0); } +#endif /* CONFIG_SMP */ static void init_rq_hrtick(struct rq *rq) {