This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / arm / mm / fault.c

diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index 29be1c0..c000617 100644 (file)
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -66,7 +66,9 @@ void show_pte(struct mm_struct *mm, unsigned long addr)
                /* We must not map this if we have highmem enabled */
                pte = pte_offset_map(pmd, addr);
                printk(", *pte=%08lx", pte_val(*pte));
+#ifdef CONFIG_CPU_32
                printk(", *ppte=%08lx", pte_val(pte[-PTRS_PER_PTE]));
+#endif
                pte_unmap(pte);
 #endif
        } while(0);
@@ -127,7 +129,7 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
        si.si_signo = SIGSEGV;
        si.si_errno = 0;
        si.si_code = code;
-       si.si_addr = (void __user *)addr;
+       si.si_addr = (void *)addr;
        force_sig_info(SIGSEGV, &si, tsk);
 }