From 9efc89840d2d24e0f21237306449ef4e2fafd667 Mon Sep 17 00:00:00 2001 From: Tiejun Chen Date: Tue, 15 Jan 2013 17:01:19 +0000 Subject: [PATCH] --- yaml --- r: 349327 b: refs/heads/master c: 689dfa894c57842a05bf6dc9f97e6bb71ec5f386 h: refs/heads/master i: 349325: f2ed67f09f6573ee01cd32a52f70d9f1000e23c8 349323: 2f09cfd6037dd5ff095a0a2d90f234aa6d420e35 349319: df82305a9c0188d9a57ec50e057cdf5d7002fb44 349311: 713b235d98287c5099181b8a103cdda05ff4755b v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/time.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f13eb9d8d11a..aabe7f8088f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fefd9e6f8860249b2c284d89cb2e51fa71a9503a +refs/heads/master: 689dfa894c57842a05bf6dc9f97e6bb71ec5f386 diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c index 6f6b1cccc916..127361e093f4 100644 --- a/trunk/arch/powerpc/kernel/time.c +++ b/trunk/arch/powerpc/kernel/time.c @@ -494,10 +494,15 @@ void timer_interrupt(struct pt_regs * regs) set_dec(DECREMENTER_MAX); /* Some implementations of hotplug will get timer interrupts while - * offline, just ignore these + * offline, just ignore these and we also need to set + * decrementers_next_tb as MAX to make sure __check_irq_replay + * don't replay timer interrupt when return, otherwise we'll trap + * here infinitely :( */ - if (!cpu_online(smp_processor_id())) + if (!cpu_online(smp_processor_id())) { + *next_tb = ~(u64)0; return; + } /* Conditionally hard-enable interrupts now that the DEC has been * bumped to its maximum value