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.

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c
index 964c6767dc73..04a39aa7f1f9 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;