Merge branch 'am335x-phy-fixes' into omap-for-v5.0/fixes-v2

[mirror_ubuntu-eoan-kernel.git] / arch / alpha / mm / fault.c

diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
index de2bd217adad110842122cb1610c1c76209a1745..d73dc473fbb9432f61d6f1383224a6aff1f67249 100644 (file)
--- a/arch/alpha/mm/fault.c
+++ b/arch/alpha/mm/fault.c
@@ -87,7 +87,8 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
        struct vm_area_struct * vma;
        struct mm_struct *mm = current->mm;
        const struct exception_table_entry *fixup;
-       int fault, si_code = SEGV_MAPERR;
+       int si_code = SEGV_MAPERR;
+       vm_fault_t fault;
        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
        /* As of EV6, a load into $31/$f31 is a prefetch, and never faults