diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-04 23:25:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-04 23:25:58 -0800 |
| commit | 904e737b7ccca4eb807db430320f0fea7c2a6c9a (patch) | |
| tree | 942c905f941ce309d7dbc19ed9d2271994fba3ef | |
| parent | 3734718fab999de886da07755c18cd8c06f5e5fc (diff) | |
| parent | 9af23ccb6e5755c366b9f019d5bdbdf430c58172 (diff) | |
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
| -rw-r--r-- | arch/sparc64/mm/tlb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sparc64/mm/tlb.c b/arch/sparc64/mm/tlb.c index e2d79fc14aa4..f900be7beadd 100644 --- a/arch/sparc64/mm/tlb.c +++ b/arch/sparc64/mm/tlb.c @@ -118,11 +118,9 @@ void flush_tlb_pgtables(struct mm_struct *mm, unsigned long start, unsigned long */ BUG_ON(s > e); -#if 0 - /* Currently free_pgtables guarantees this. */ s &= PMD_MASK; e = (e + PMD_SIZE - 1) & PMD_MASK; -#endif + vpte_base = (tlb_type == spitfire ? VPTE_BASE_SPITFIRE : VPTE_BASE_CHEETAH); |