aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.34/980-vm_exports.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-08-22 13:26:06 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-08-22 13:26:06 +0000
commit09e05d833df83203f92e3b22ff892af9aeeb8576 (patch)
tree9b6ac4b61f1df5afcbf4e81e0aa7ea928a01c2b7 /target/linux/generic/patches-2.6.34/980-vm_exports.patch
parent9638e849667eb1167e1efeffe0f086ce5c324297 (diff)
downloadupstream-09e05d833df83203f92e3b22ff892af9aeeb8576.tar.gz
upstream-09e05d833df83203f92e3b22ff892af9aeeb8576.tar.bz2
upstream-09e05d833df83203f92e3b22ff892af9aeeb8576.zip
kernel: update kernel version to 2.6.34.5
SVN-Revision: 22759
Diffstat (limited to 'target/linux/generic/patches-2.6.34/980-vm_exports.patch')
-rw-r--r--target/linux/generic/patches-2.6.34/980-vm_exports.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.34/980-vm_exports.patch b/target/linux/generic/patches-2.6.34/980-vm_exports.patch
index 72ed97a469..8f6376ecfb 100644
--- a/target/linux/generic/patches-2.6.34/980-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.34/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
-@@ -4367,6 +4367,7 @@ int can_nice(const struct task_struct *p
+@@ -4370,6 +4370,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
-@@ -2596,6 +2597,7 @@ int vmtruncate_range(struct inode *inode
+@@ -2606,6 +2607,7 @@ int vmtruncate_range(struct inode *inode
return 0;
}