diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-18 13:23:30 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-18 13:23:30 +1100 |
| commit | 3b7faeb49e7c35db857b595c389436994ab1275e (patch) | |
| tree | 973208eb935876ebed9f2baf262ed08351764752 /arch/powerpc/kernel/entry_32.S | |
| parent | 82a0a1cc8f94bc59e5919715bc03fc8353fa770d (diff) | |
| parent | 96a8bac5895a41b0fb05a6aa7c3fa1ea631a91fe (diff) | |
| download | op-kernel-dev-3b7faeb49e7c35db857b595c389436994ab1275e.zip op-kernel-dev-3b7faeb49e7c35db857b595c389436994ab1275e.tar.gz | |
Merge commit 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/kernel/entry_32.S')
| -rw-r--r-- | arch/powerpc/kernel/entry_32.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 6f7eb7e..301c646 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -63,7 +63,7 @@ debug_transfer_to_handler: .globl crit_transfer_to_handler crit_transfer_to_handler: -#ifdef CONFIG_FSL_BOOKE +#ifdef CONFIG_PPC_BOOK3E_MMU mfspr r0,SPRN_MAS0 stw r0,MAS0(r11) mfspr r0,SPRN_MAS1 @@ -78,7 +78,7 @@ crit_transfer_to_handler: mfspr r0,SPRN_MAS7 stw r0,MAS7(r11) #endif /* CONFIG_PHYS_64BIT */ -#endif /* CONFIG_FSL_BOOKE */ +#endif /* CONFIG_PPC_BOOK3E_MMU */ #ifdef CONFIG_44x mfspr r0,SPRN_MMUCR stw r0,MMUCR(r11) @@ -914,7 +914,7 @@ exc_exit_restart_end: mtspr SPRN_##exc_lvl_srr0,r9; \ mtspr SPRN_##exc_lvl_srr1,r10; -#if defined(CONFIG_FSL_BOOKE) +#if defined(CONFIG_PPC_BOOK3E_MMU) #ifdef CONFIG_PHYS_64BIT #define RESTORE_MAS7 \ lwz r11,MAS7(r1); \ |
