diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 15:07:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 15:07:10 -0700 |
| commit | 34bac238cc13cdb57f3b353b6e5ed3eae2cff158 (patch) | |
| tree | 3fff52deec8671a5599bde9e711f166a7c92d693 /arch/sh/mm/fault.c | |
| parent | 247284481ca40288bd120cf0707681c3bdbee78f (diff) | |
| parent | cc6f33db30c4fcf7915270619e81a91d6190b6c8 (diff) | |
| download | kernel_samsung_smdk4412-34bac238cc13cdb57f3b353b6e5ed3eae2cff158.tar.gz kernel_samsung_smdk4412-34bac238cc13cdb57f3b353b6e5ed3eae2cff158.tar.bz2 kernel_samsung_smdk4412-34bac238cc13cdb57f3b353b6e5ed3eae2cff158.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23:
sh: fix defconfigs for sh7751r boards
sh: fix cf support on r2d boards
sh: update r2d defconfig
sh: update snapgear defconfig.
sh: Fix SH-X3 FPU exception handling.
sh: Fix pgd mismatch from cached TTB in unhandled fault.
sh: Don't include fault-nommu on SH-2/SH-2A.
sh: Fix irqflags tracing for SH-3/4 nommu.
sh: Fix lockdep debugging oops on SH-3/4.
Diffstat (limited to 'arch/sh/mm/fault.c')
| -rw-r--r-- | arch/sh/mm/fault.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c index 964c6767dc7..04a39aa7f1f 100644 --- a/arch/sh/mm/fault.c +++ b/arch/sh/mm/fault.c @@ -184,8 +184,7 @@ no_context: printk(KERN_ALERT "pc = %08lx\n", regs->pc); page = (unsigned long)get_TTB(); if (page) { - page = ((__typeof__(page) *) __va(page))[address >> - PGDIR_SHIFT]; + page = ((__typeof__(page) *)page)[address >> PGDIR_SHIFT]; printk(KERN_ALERT "*pde = %08lx\n", page); if (page & _PAGE_PRESENT) { page &= PAGE_MASK; |