diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-12-26 15:29:19 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-02-13 10:54:44 +0900 |
| commit | 7a847f819063b80cc5b38d39e8aad4d60f6ca2fd (patch) | |
| tree | f60ac00a1860d188e83f31883df7be807e500bff /arch/sh/kernel/cpu/sh3/entry.S | |
| parent | aa4a5db52a440d32eab134bfb79d2c9af71eedb4 (diff) | |
sh: More tidying for large base pages.
There were a few more things that needed fixing up, namely THREAD_SIZE
and the TLB miss handler where certain PTRS_PER_PGD == PTRS_PER_PTE
assumptions were being made.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh3/entry.S')
| -rw-r--r-- | arch/sh/kernel/cpu/sh3/entry.S | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index 014ac37ca16..1c520358ba9 100644 --- a/arch/sh/kernel/cpu/sh3/entry.S +++ b/arch/sh/kernel/cpu/sh3/entry.S @@ -332,12 +332,6 @@ general_exception: ! ! -/* This code makes some assumptions to improve performance. - * Make sure they are stil true. */ -#if PTRS_PER_PGD != PTRS_PER_PTE -#error PGD and PTE sizes don't match -#endif - /* gas doesn't flag impossible values for mov #immediate as an error */ #if (_PAGE_PRESENT >> 2) > 0x7f #error cannot load PAGE_PRESENT as an immediate @@ -399,6 +393,7 @@ tlb_miss: bt 20f ! 110 BR + mov.w 3f, k3 ! 8 LS (latency=2) (PTRS_PER_PTE-1) << 2 and k3, k0 ! 78 EX mov.w 5f, k4 ! 8 LS (latency=2) _PAGE_PRESENT @@ -491,8 +486,9 @@ tlb_miss: .align 5 ! Once cache line if possible... 1: .long swapper_pg_dir +3: .short (PTRS_PER_PTE-1) << 2 4: .short (PTRS_PER_PGD-1) << 2 -5: .short _PAGE_PRESENT +5: .long _PAGE_PRESENT 7: .long _PAGE_FLAGS_HARDWARE_MASK 8: .long MMU_PTEH #ifdef COUNT_EXCEPTIONS |