git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HWPOISON: comment the possible set_page_dirty() race
[safe/jmp/linux-2.6]
/
mm
/
mprotect.c
diff --git
a/mm/mprotect.c
b/mm/mprotect.c
index
d80311b
..
8bc969d
100644
(file)
--- a/
mm/mprotect.c
+++ b/
mm/mprotect.c
@@
-23,7
+23,7
@@
#include <linux/swapops.h>
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
#include <linux/swapops.h>
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
-#include <linux/perf_
counter
.h>
+#include <linux/perf_
event
.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/cacheflush.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/cacheflush.h>
@@
-300,7
+300,7
@@
SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
if (error)
goto out;
error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
if (error)
goto out;
- perf_
counter
_mmap(vma);
+ perf_
event
_mmap(vma);
nstart = tmp;
if (nstart < prev->vm_end)
nstart = tmp;
if (nstart < prev->vm_end)