diff --git a/[refs] b/[refs] index 54bf7c407707..72aa82985d98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f650cf2b811cfb605f10483eeb1dc86f43cdbcb +refs/heads/master: bca7c20764c83a44c7b8b0831089922d56a3a9a2 diff --git a/trunk/arch/sh/mm/fault.c b/trunk/arch/sh/mm/fault.c index 123fb80c859d..cfeefc10e254 100644 --- a/trunk/arch/sh/mm/fault.c +++ b/trunk/arch/sh/mm/fault.c @@ -174,11 +174,9 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, printk(KERN_ALERT "Unable to handle kernel paging request"); printk(" at virtual address %08lx\n", address); printk(KERN_ALERT "pc = %08lx\n", regs->pc); - asm volatile("mov.l %1, %0" - : "=r" (page) - : "m" (__m(MMU_TTB))); + page = (unsigned long)get_TTB(); if (page) { - page = ((unsigned long *) page)[address >> 22]; + page = ((unsigned long *) page)[address >> PGDIR_SHIFT]; printk(KERN_ALERT "*pde = %08lx\n", page); if (page & _PAGE_PRESENT) { page &= PAGE_MASK;