aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/950-vm_exports.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-11-24 10:17:33 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-11-24 10:17:33 +0000
commitc26c5eff0ea43f9645fdb50b8dfd5f1fe4fb6640 (patch)
tree71f8de7a390beace28d8456266cad646ffdf46f5 /target/linux/generic/patches-3.18/950-vm_exports.patch
parent35902404fce9e8007a69ba893a8a8e569494209e (diff)
downloadupstream-c26c5eff0ea43f9645fdb50b8dfd5f1fe4fb6640.tar.gz
upstream-c26c5eff0ea43f9645fdb50b8dfd5f1fe4fb6640.tar.bz2
upstream-c26c5eff0ea43f9645fdb50b8dfd5f1fe4fb6640.zip
update .18 support for -rc6
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 43357
Diffstat (limited to 'target/linux/generic/patches-3.18/950-vm_exports.patch')
-rw-r--r--target/linux/generic/patches-3.18/950-vm_exports.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.18/950-vm_exports.patch b/target/linux/generic/patches-3.18/950-vm_exports.patch
index 0291957bf0..eae65d2bff 100644
--- a/target/linux/generic/patches-3.18/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.18/950-vm_exports.patch
@@ -52,7 +52,7 @@
* When we die, we re-parent all our children, and try to:
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -3188,6 +3188,7 @@ int can_nice(const struct task_struct *p
+@@ -3159,6 +3159,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}