summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.0/950-vm_exports.patch
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-12 13:44:16 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-12 13:44:16 +0000
commit7c0785c3072ee121692a47991343242ab9a0c0b3 (patch)
treeeea4037858eaace69337f4ea09ec081d02468c15 /target/linux/generic/patches-3.0/950-vm_exports.patch
parent33e064fbce9313ffa631c25bf27da0096d0c2f0d (diff)
[generic]: upgrade to 3.0-rc7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27600 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 0ba09166c..b9e6f4088 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;
}