diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-10-11 13:36:52 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-10-11 13:36:52 -0500 |
| commit | 8a13c4f972e6c107d8cff54de647544c00e25b41 (patch) | |
| tree | bd1e291a935fe8420b270d0a4f8e9d3b7a8e1bd1 /arch/powerpc/kernel/head_fsl_booke.S | |
| parent | f5d7d13cd96313a90f8d13fa5d6e0704f6d534ba (diff) | |
| download | kernel_samsung_smdk4412-8a13c4f972e6c107d8cff54de647544c00e25b41.zip kernel_samsung_smdk4412-8a13c4f972e6c107d8cff54de647544c00e25b41.tar.gz kernel_samsung_smdk4412-8a13c4f972e6c107d8cff54de647544c00e25b41.tar.bz2 | |
[POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers
Move to using PAGE_OFFSET instead of TASK_SIZE or KERNELBASE value on
6xx/40x/44x/fsl-booke to determine if the faulting address is a kernel or
user space address. This mimics how the macro is_kernel_addr() works.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/head_fsl_booke.S')
| -rw-r--r-- | arch/powerpc/kernel/head_fsl_booke.S | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S index ee33ddd..4b98227 100644 --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S @@ -461,8 +461,7 @@ interrupt_base: /* If we are faulting a kernel address, we have to use the * kernel page tables. */ - lis r11, TASK_SIZE@h - ori r11, r11, TASK_SIZE@l + lis r11, PAGE_OFFSET@h cmplw 0, r10, r11 bge 2f @@ -584,8 +583,7 @@ interrupt_base: /* If we are faulting a kernel address, we have to use the * kernel page tables. */ - lis r11, TASK_SIZE@h - ori r11, r11, TASK_SIZE@l + lis r11, PAGE_OFFSET@h cmplw 5, r10, r11 blt 5, 3f lis r11, swapper_pg_dir@h @@ -645,8 +643,7 @@ interrupt_base: /* If we are faulting a kernel address, we have to use the * kernel page tables. */ - lis r11, TASK_SIZE@h - ori r11, r11, TASK_SIZE@l + lis r11, PAGE_OFFSET@h cmplw 5, r10, r11 blt 5, 3f lis r11, swapper_pg_dir@h @@ -744,7 +741,7 @@ data_access: * r10 - EA of fault * r11 - TLB (info from Linux PTE) * r12, r13 - available to use - * CR5 - results of addr < TASK_SIZE + * CR5 - results of addr >= PAGE_OFFSET * MAS0, MAS1 - loaded with proper value when we get here * MAS2, MAS3 - will need additional info from Linux PTE * Upon exit, we reload everything and RFI. |