From b5f2e661344596cac6b2cb8d20b19a9e5d9b259e Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 18 Aug 2009 19:08:31 +0000 Subject: [PATCH] --- yaml --- r: 161787 b: refs/heads/master c: 6c188829d2c20a1d02aedb13db34b3ca2a8f0dc4 h: refs/heads/master i: 161785: dcd48c679f653a0a890295c24243dfebc64247b2 161783: 514e52fa7b39e87fe22839e9bb54d729ec23c37a v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/exceptions-64e.S | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2c4cfd83131e..e7320236261e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f45c4486f70d0a6502e7499a8664cdc0bba84cd2 +refs/heads/master: 6c188829d2c20a1d02aedb13db34b3ca2a8f0dc4 diff --git a/trunk/arch/powerpc/kernel/exceptions-64e.S b/trunk/arch/powerpc/kernel/exceptions-64e.S index 695d4847d228..3611b0e7d46d 100644 --- a/trunk/arch/powerpc/kernel/exceptions-64e.S +++ b/trunk/arch/powerpc/kernel/exceptions-64e.S @@ -774,9 +774,11 @@ _STATIC(init_thread_book3e) /* Make sure interrupts are off */ wrteei 0 - /* disable watchdog and FIT and enable DEC interrupts */ - lis r3,TCR_DIE@h + /* disable all timers and clear out status */ + li r3,0 mtspr SPRN_TCR,r3 + mfspr r3,SPRN_TSR + mtspr SPRN_TSR,r3 blr