diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-27 05:13:41 +0200 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-27 05:13:41 +0200 |
commit | 3c2ee2d9f41ef43a581b26b677d2b4054ccbd200 (patch) | |
tree | f427586e5a1fecd1a21d9f4a5e088f31363f5282 /arch/powerpc/mm | |
parent | powerpc/pseries: Reduce the polling interval in __cpu_up() (diff) | |
parent | powerpc/qe_lib: Set gpio data before changing the direction to output (diff) | |
download | linux-3c2ee2d9f41ef43a581b26b677d2b4054ccbd200.tar.xz linux-3c2ee2d9f41ef43a581b26b677d2b4054ccbd200.zip |
Merge commit 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r-- | arch/powerpc/mm/tlb_nohash_low.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/mm/tlb_nohash_low.S b/arch/powerpc/mm/tlb_nohash_low.S index 7bcd9fbf6cc6..bbdc5b577b85 100644 --- a/arch/powerpc/mm/tlb_nohash_low.S +++ b/arch/powerpc/mm/tlb_nohash_low.S @@ -124,8 +124,6 @@ _GLOBAL(_tlbil_pid) * to have the larger code path before the _SECTION_ELSE */ -#define MMUCSR0_TLBFI (MMUCSR0_TLB0FI | MMUCSR0_TLB1FI | \ - MMUCSR0_TLB2FI | MMUCSR0_TLB3FI) /* * Flush MMU TLB on the local processor */ |