summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-18 11:11:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-18 11:11:01 -0800
commit451bb1a6b2d24df6d677fe790950bec0679b741d (patch)
tree9d6ff65847c53871c280e55b236165b5f667e315 /kernel/time
parent98da295b35cf23222b52a3dc1d768b7997c95a32 (diff)
parentc1a9eeb938b5433947e5ea22f89baff3182e7075 (diff)
downloadlinux-451bb1a6b2d24df6d677fe790950bec0679b741d.tar.bz2
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner: "Prevent NULL pointer dereferencing in the tick broadcast code. Old bug, which got unearthed by the hotplug ordering problem" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: tick/broadcast: Prevent NULL pointer dereference
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/tick-broadcast.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index f6aae7977824..d2a20e83ebae 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -871,6 +871,9 @@ void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
{
int cpu = smp_processor_id();
+ if (!bc)
+ return;
+
/* Set it up only once ! */
if (bc->event_handler != tick_handle_oneshot_broadcast) {
int was_periodic = clockevent_state_periodic(bc);