The patch titled
mm-fault-feedback-2-fix
has been added to the -mm tree. Its filename is
mm-fault-feedback-2-fix.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: mm-fault-feedback-2-fix
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Nick Piggin <npiggin@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/alpha/mm/fault.c | 4 ++--
arch/s390/lib/uaccess_pt.c | 2 +-
arch/sparc/mm/fault.c | 1 +
arch/sparc64/mm/fault.c | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff -puN arch/alpha/mm/fault.c~mm-fault-feedback-2-fix arch/alpha/mm/fault.c
--- a/arch/alpha/mm/fault.c~mm-fault-feedback-2-fix
+++ a/arch/alpha/mm/fault.c
@@ -156,9 +156,9 @@ do_page_fault(unsigned long address, uns
BUG();
}
if (fault & VM_FAULT_MAJOR)
- tsk->maj_flt++;
+ current->maj_flt++;
else
- tsk->min_flt++;
+ current->min_flt++;
return;
/* Something tried to access memory that isn't in our memory map.
diff -puN arch/s390/lib/uaccess_pt.c~mm-fault-feedback-2-fix arch/s390/lib/uaccess_pt.c
--- a/arch/s390/lib/uaccess_pt.c~mm-fault-feedback-2-fix
+++ a/arch/s390/lib/uaccess_pt.c
@@ -50,7 +50,7 @@ survive:
if (fault & VM_FAULT_OOM)
goto out_of_memory;
else if (fault & VM_FAULT_SIGBUS)
- goto do_sigbus;
+ goto out_sigbus;
BUG();
}
if (fault & VM_FAULT_MAJOR)
diff -puN arch/sparc/mm/fault.c~mm-fault-feedback-2-fix arch/sparc/mm/fault.c
--- a/arch/sparc/mm/fault.c~mm-fault-feedback-2-fix
+++ a/arch/sparc/mm/fault.c
@@ -226,6 +226,7 @@ asmlinkage void do_sparc_fault(struct pt
unsigned long g2;
siginfo_t info;
int from_user = !(regs->psr & PSR_PS);
+ int fault;
if(text_fault)
address = regs->pc;
diff -puN arch/sparc64/mm/fault.c~mm-fault-feedback-2-fix arch/sparc64/mm/fault.c
--- a/arch/sparc64/mm/fault.c~mm-fault-feedback-2-fix
+++ a/arch/sparc64/mm/fault.c
@@ -424,9 +424,9 @@ good_area:
BUG();
}
if (fault & VM_FAULT_MAJOR)
- tsk->maj_flt++;
+ current->maj_flt++;
else
- tsk->min_flt++;
+ current->min_flt++;
up_read(&mm->mmap_sem);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
mm-merge-populate-and-nopage-into-fault-fixes-nonlinear.patch
mm-fault-feedback-2-fix.patch
readahead-split-ondemand-readahead-interface-into-two-functions-fix.patch
kernel-doc-fix-leading-dot-in-man-mode-output.patch
coredump-masking-reimplementation-of-dumpable-using-two-flags.patch
add-sys-kernel-notes-fix.patch
lockstat-core-infrastructure.patch
lockstat-human-readability-tweaks-fix.patch
lockdep-various-fixes.patch
lockstat-measure-lock-bouncing.patch
some-kmalloc-memset-kzalloc-tree-wide.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
