diff for duplicates of <1311761831.24752.413.camel@twins> diff --git a/a/1.txt b/N1/1.txt index 07d3ab9..e768522 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,24 +2,21 @@ On Wed, 2011-07-27 at 11:09 +0100, David Howells wrote: > Can you inline this for the NOMMU case please? --- -Subject: mm: Fix fixup_user_fault() for MMU=3Dn=20 +Subject: mm: Fix fixup_user_fault() for MMU=n In commit 2efaca927 ("mm/futex: fix futex writes on archs with SW -tracking of dirty & young") we forgot about MMU=3Dn. This patch fixes +tracking of dirty & young") we forgot about MMU=n. This patch fixes that. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> --- Index: linux-2.6/include/linux/mm.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +=================================================================== --- linux-2.6.orig/include/linux/mm.h +++ 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 *vm= -a, + 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); @@ -30,7 +27,7 @@ a, BUG(); return VM_FAULT_SIGBUS; } -+static inline int fixup_user_fault(struct task_struct *tsk,=20 ++static inline int fixup_user_fault(struct task_struct *tsk, + struct mm_struct *mm, unsigned long address, + unsigned int fault_flags) +{ @@ -39,7 +36,7 @@ a, + return -EFAULT; +} #endif -=20 + 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, @@ -47,6 +44,6 @@ a, 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); -=20 + extern int try_to_release_page(struct page * page, gfp_t gfp_mask); extern void do_invalidatepage(struct page *page, unsigned long offset); diff --git a/a/content_digest b/N1/content_digest index 540d4cd..f78ce83 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -21,41 +21,39 @@ "Subject\0Re: [RFC/PATCH] mm/futex: Fix futex writes on archs with SW tracking of dirty & young\0" "Date\0Wed, 27 Jul 2011 12:17:11 +0200\0" "To\0David Howells <dhowells@redhat.com>\0" - "Cc\0tony.luck@intel.com" + "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Mike Frysinger <vapier.adi@gmail.com> Shan Hai <haishan.bai@gmail.com> - linux-kernel@vger.kernel.org - cmetcalf@tilera.com paulus@samba.org - uclinux-dist-devel@blackfin.uclinux.org tglx@linutronix.de walken@google.com + cmetcalf@tilera.com + tony.luck@intel.com + akpm@linux-foundation.org linuxppc-dev@lists.ozlabs.org - " akpm@linux-foundation.org\0" + linux-kernel@vger.kernel.org + " uclinux-dist-devel@blackfin.uclinux.org\0" "\00:1\0" "b\0" "On Wed, 2011-07-27 at 11:09 +0100, David Howells wrote:\n" "> Can you inline this for the NOMMU case please?\n" "\n" "---\n" - "Subject: mm: Fix fixup_user_fault() for MMU=3Dn=20\n" + "Subject: mm: Fix fixup_user_fault() for MMU=n \n" "\n" "In commit 2efaca927 (\"mm/futex: fix futex writes on archs with SW\n" - "tracking of dirty & young\") we forgot about MMU=3Dn. This patch fixes\n" + "tracking of dirty & young\") we forgot about MMU=n. This patch fixes\n" "that.\n" "\n" "Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>\n" "---\n" "Index: linux-2.6/include/linux/mm.h\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "===================================================================\n" "--- linux-2.6.orig/include/linux/mm.h\n" "+++ linux-2.6/include/linux/mm.h\n" "@@ -962,6 +962,8 @@ int invalidate_inode_page(struct page *p\n" " #ifdef CONFIG_MMU\n" - " extern int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vm=\n" - "a,\n" + " extern int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,\n" " \t\t\tunsigned long address, unsigned int flags);\n" "+extern int fixup_user_fault(struct task_struct *tsk, struct mm_struct *mm,\n" "+\t\t\t unsigned long address, unsigned int fault_flags);\n" @@ -66,7 +64,7 @@ " \tBUG();\n" " \treturn VM_FAULT_SIGBUS;\n" " }\n" - "+static inline int fixup_user_fault(struct task_struct *tsk,=20\n" + "+static inline int fixup_user_fault(struct task_struct *tsk, \n" "+\t\tstruct mm_struct *mm, unsigned long address,\n" "+\t\tunsigned int fault_flags)\n" "+{\n" @@ -75,7 +73,7 @@ "+\treturn -EFAULT;\n" "+}\n" " #endif\n" - "=20\n" + " \n" " extern int make_pages_present(unsigned long addr, unsigned long end);\n" "@@ -988,8 +998,6 @@ int get_user_pages(struct task_struct *t\n" " int get_user_pages_fast(unsigned long start, int nr_pages, int write,\n" @@ -83,8 +81,8 @@ " struct page *get_dump_page(unsigned long addr);\n" "-extern int fixup_user_fault(struct task_struct *tsk, struct mm_struct *mm,\n" "-\t\t\t unsigned long address, unsigned int fault_flags);\n" - "=20\n" + " \n" " extern int try_to_release_page(struct page * page, gfp_t gfp_mask);\n" extern void do_invalidatepage(struct page *page, unsigned long offset); -ea7054802549572efb1393acecf705a09761c7106b7f254c51653b56a904fa5d +346e04eaf0c4b33b96cc85c5b8df546b5d9dff90cde111c9188e394404f488cf
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.