diff --git a/[refs] b/[refs] index 8447ce417b1c..e23fcc807a29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e08d8aaeadac37c8d149b5d5bda6cf7a98d21e92 +refs/heads/master: b62ad83d91ebf1368e9e72d476b18698ac67bef9 diff --git a/trunk/arch/sh/mm/fault_32.c b/trunk/arch/sh/mm/fault_32.c index 60d74f793a1d..33b43d20e9f6 100644 --- a/trunk/arch/sh/mm/fault_32.c +++ b/trunk/arch/sh/mm/fault_32.c @@ -172,7 +172,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, bust_spinlocks(1); if (oops_may_print()) { - __typeof__(pte_val(__pte(0))) page; + unsigned long page; if (address < PAGE_SIZE) printk(KERN_ALERT "Unable to handle kernel NULL "