Skip to contentSkip to conversation

mm: Fix fixup_user_fault() for MMU=n

PATCH New Peter Zijlstra 1 participant 1 message Aug 8, 2011 MM core

lore
Share & tools
lore

Peter Zijlstra

author
#0 lore raw

PATCH 1/1 mm: Fix fixup_user_fault() for MMU=n

Subject: mm: Fix fixup_user_fault() for MMU=n
From: Peter Zijlstra <[email protected]>
Date: Wed, 27 Jul 2011 12:17:11 +0200

In commit 2efaca927 ("mm/futex: fix futex writes on archs with SW tracking of dirty & young") we forgot about MMU=n. This patch fixes that.

Signed-off-by Peter Zijlstra <[email protected]>
Acked-by Benjamin Herrenschmidt <[email protected]>
Acked-by David Howells <[email protected]>
Link http://lkml.kernel.org/r/1311761831.24752.413.camel@twins open here

---

include/linux/mm.h +10 -2
Index: linux-2.6/include/linux/mm.h
===================================================================
@@ -962,6 +962,8 @@ int invalidate_inode_page(struct page *p
 #ifdef CONFIG_MMU
 extern int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 			unsigned long address, unsigned int flags);
+extern int fixup_user_fault(struct task_struct *tsk, struct mm_struct *mm,
+			    unsigned long address, unsigned int fault_flags);
 #else
 static inline int handle_mm_fault(struct mm_struct *mm,
 			struct vm_area_struct *vma, unsigned long address,

@@ -971,6 +973,14 @@ static inline int handle_mm_fault(struct
 	BUG();
 	return VM_FAULT_SIGBUS;
 }
+static inline int fixup_user_fault(struct task_struct *tsk, 
+		struct mm_struct *mm, unsigned long address,
+		unsigned int fault_flags)
+{
+	/* should never happen if there's no MMU */
+	BUG();
+	return -EFAULT;
+}
 #endif
 
 extern int make_pages_present(unsigned long addr, unsigned long end);

@@ -988,8 +998,6 @@ int get_user_pages(struct task_struct *t
 int get_user_pages_fast(unsigned long start, int nr_pages, int write,
 			struct page **pages);
 struct page *get_dump_page(unsigned long addr);
-extern int fixup_user_fault(struct task_struct *tsk, struct mm_struct *mm,
-			    unsigned long address, unsigned int fault_flags);
 
 extern int try_to_release_page(struct page * page, gfp_t gfp_mask);
 extern void do_invalidatepage(struct page *page, unsigned long offset);