diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-01-01 11:11:17 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-01-01 11:11:17 +0000 |
| commit | 311c91775d97f0932231aa114e39a14cfeffef51 (patch) | |
| tree | 3a3647cf07d4dd0eb60b031c06b8c83fb8687d01 /target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch | |
| parent | f759c749de09b04d2827cce5e54c88a9a7e9a6d7 (diff) | |
| download | upstream-311c91775d97f0932231aa114e39a14cfeffef51.tar.gz upstream-311c91775d97f0932231aa114e39a14cfeffef51.tar.bz2 upstream-311c91775d97f0932231aa114e39a14cfeffef51.zip | |
kernel: update to 2.6.31.9 and 2.6.32.2, and refresh patches
SVN-Revision: 18982
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch index 91f85c2b61..724b1f030c 100644 --- a/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch +++ b/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch @@ -1,6 +1,6 @@ --- a/mm/shmem.c +++ b/mm/shmem.c -@@ -2775,6 +2775,16 @@ int shmem_lock(struct file *file, int lo +@@ -2608,6 +2608,16 @@ int shmem_lock(struct file *file, int lo /* common code */ @@ -17,7 +17,7 @@ /** * shmem_file_setup - get an unlinked file living in tmpfs * @name: name for dentry (to be seen in /proc/<pid>/maps -@@ -2854,9 +2864,6 @@ int shmem_zero_setup(struct vm_area_stru +@@ -2687,9 +2697,6 @@ int shmem_zero_setup(struct vm_area_stru if (IS_ERR(file)) return PTR_ERR(file); @@ -68,7 +68,7 @@ * macro override instead of weak attribute alias, to workaround --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -6075,6 +6075,7 @@ int can_nice(const struct task_struct *p +@@ -6095,6 +6095,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || capable(CAP_SYS_NICE)); } |