summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.38/980-vm_exports.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-16 18:31:23 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-16 18:31:23 +0000
commitc2f8669f74b182557d89aa77601b0fa383fc5f8b (patch)
treea7342db0bb7964ea1faa9ea13d48fd6d9946d9db /target/linux/generic/patches-2.6.38/980-vm_exports.patch
parent4edd0fb0bafbb59e931e8ac471432f33cc1b0cf3 (diff)
kernel: refresh 2.6.38 patches for final release
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26194 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.38/980-vm_exports.patch')
-rw-r--r--target/linux/generic/patches-2.6.38/980-vm_exports.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.38/980-vm_exports.patch b/target/linux/generic/patches-2.6.38/980-vm_exports.patch
index 811b23b34..9bafb4870 100644
--- a/target/linux/generic/patches-2.6.38/980-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.38/980-vm_exports.patch
@@ -76,7 +76,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -4640,6 +4640,7 @@ int can_nice(const struct task_struct *p
+@@ -4641,6 +4641,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
@@ -94,7 +94,7 @@
/**
* zap_vma_ptes - remove ptes mapping the vma
-@@ -2690,6 +2691,7 @@ int vmtruncate_range(struct inode *inode
+@@ -2692,6 +2693,7 @@ int vmtruncate_range(struct inode *inode
return 0;
}