diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-09 02:57:57 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-09 02:57:57 +0200 |
| commit | ea4e89afedc7fc64078076eacbcffaaa742baf0d (patch) | |
| tree | 1e4a14dd1ada2eff8d1cb4d76bf9e337e079845e /arch/powerpc/kernel/entry_64.S | |
| parent | powerpc/windfarm: don't pass const strings to snprintf (diff) | |
| parent | powerpc/irq: Make alignment & program interrupt behave the same (diff) | |
| download | linux-ea4e89afedc7fc64078076eacbcffaaa742baf0d.tar.xz linux-ea4e89afedc7fc64078076eacbcffaaa742baf0d.zip | |
Merge branch 'merge' into next
Diffstat (limited to 'arch/powerpc/kernel/entry_64.S')
| -rw-r--r-- | arch/powerpc/kernel/entry_64.S | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index fd4604674468..29f13570214d 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -763,16 +763,6 @@ do_work: SOFT_DISABLE_INTS(r3,r4) 1: bl .preempt_schedule_irq - /* Hard-disable interrupts again (and update PACA) */ -#ifdef CONFIG_PPC_BOOK3E - wrteei 0 -#else - ld r10,PACAKMSR(r13) /* Get kernel MSR without EE */ - mtmsrd r10,1 -#endif /* CONFIG_PPC_BOOK3E */ - li r0,PACA_IRQ_HARD_DIS - stb r0,PACAIRQHAPPENED(r13) - /* Re-test flags and eventually loop */ clrrdi r9,r1,THREAD_SHIFT ld r4,TI_FLAGS(r9) @@ -783,14 +773,6 @@ do_work: user_work: #endif /* CONFIG_PREEMPT */ - /* Enable interrupts */ -#ifdef CONFIG_PPC_BOOK3E - wrteei 1 -#else - ori r10,r10,MSR_EE - mtmsrd r10,1 -#endif /* CONFIG_PPC_BOOK3E */ - andi. r0,r4,_TIF_NEED_RESCHED beq 1f bl .restore_interrupts |