Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[linux.git] / arch / um / kernel / trap.c

diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index ec9a42c14c56596777a0f5d78a9d48c60ace3ac0..cced829460427180091b494e7eb2c9315dd66d73 100644 (file)
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -72,7 +72,7 @@ int handle_page_fault(unsigned long address, unsigned long ip,
        }
 
        do {
-               int fault;
+               vm_fault_t fault;
 
                fault = handle_mm_fault(vma, address, flags);