diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-26 23:13:41 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-26 23:13:41 -0400 |
| commit | 3c2ee2d9f41ef43a581b26b677d2b4054ccbd200 (patch) | |
| tree | f427586e5a1fecd1a21d9f4a5e088f31363f5282 /arch/powerpc/mm | |
| parent | 6776426320e151051a16bc7bf86f12d310c9e8ca (diff) | |
| parent | 1dcd8ffc81e80a170625883f63f6a5db3cd0428d (diff) | |
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) | |||
| 124 | * to have the larger code path before the _SECTION_ELSE | 124 | * to have the larger code path before the _SECTION_ELSE |
| 125 | */ | 125 | */ |
| 126 | 126 | ||
| 127 | #define MMUCSR0_TLBFI (MMUCSR0_TLB0FI | MMUCSR0_TLB1FI | \ | ||
| 128 | MMUCSR0_TLB2FI | MMUCSR0_TLB3FI) | ||
| 129 | /* | 127 | /* |
| 130 | * Flush MMU TLB on the local processor | 128 | * Flush MMU TLB on the local processor |
| 131 | */ | 129 | */ |