summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.0/950-vm_exports.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2011-07-12 13:44:16 +0000
committerImre Kaloz <kaloz@openwrt.org>2011-07-12 13:44:16 +0000
commitab5fd3c1cbf97f8623bed3ed2283b435272e7d70 (patch)
tree65214e539b83b54dd5c095924647f7212f0a3fcd /target/linux/generic/patches-3.0/950-vm_exports.patch
parent62daf628c08fe64328211dab880d37e09f660d9c (diff)
downloadmaster-31e0f0ae-ab5fd3c1cbf97f8623bed3ed2283b435272e7d70.tar.gz
master-31e0f0ae-ab5fd3c1cbf97f8623bed3ed2283b435272e7d70.tar.bz2
master-31e0f0ae-ab5fd3c1cbf97f8623bed3ed2283b435272e7d70.zip
upgrade to 3.0-rc7
SVN-Revision: 27600
Diffstat (limited to 'target/linux/generic/patches-3.0/950-vm_exports.patch')
-rw-r--r--target/linux/generic/patches-3.0/950-vm_exports.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.0/950-vm_exports.patch b/target/linux/generic/patches-3.0/950-vm_exports.patch
index 0ba09166c0..b9e6f40885 100644
--- a/target/linux/generic/patches-3.0/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.0/950-vm_exports.patch
@@ -71,7 +71,7 @@
--- a/mm/memory.c
+++ b/mm/memory.c
-@@ -1395,6 +1395,7 @@ unsigned long zap_page_range(struct vm_a
+@@ -1396,6 +1396,7 @@ unsigned long zap_page_range(struct vm_a
tlb_finish_mmu(&tlb, address, end);
return end;
}
@@ -79,7 +79,7 @@
/**
* zap_vma_ptes - remove ptes mapping the vma
-@@ -3014,6 +3015,7 @@ static inline int check_stack_guard_page
+@@ -3015,6 +3016,7 @@ static inline int check_stack_guard_page
}
return 0;
}