summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-2.6.34/980-vm_exports.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-13 17:13:11 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-13 17:13:11 +0000
commitdbf062aadfe81c54bfa147d21fe9ce83c5b7702b (patch)
treeb6a1b20795e47fc1d3a861fda103261a6fcb3f18 /target/linux/generic/patches-2.6.34/980-vm_exports.patch
parentd6c6d9b502bc41ac75557c417684243a202e8d0e (diff)
kernel: update to kernel version 2.6.34.8
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26125 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch8
1 files changed, 4 insertions, 4 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 8f6376ecfb..3feb239e3f 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
-@@ -4370,6 +4370,7 @@ int can_nice(const struct task_struct *p
+@@ -4339,6 +4339,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
@@ -104,7 +104,7 @@
* We enter with non-exclusive mmap_sem (to exclude vma changes,
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
-@@ -1173,6 +1173,7 @@ void unmap_kernel_range(unsigned long ad
+@@ -1182,6 +1182,7 @@ void unmap_kernel_range(unsigned long ad
vunmap_page_range(addr, end);
flush_tlb_kernel_range(addr, end);
}
@@ -112,7 +112,7 @@
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
{
-@@ -1288,6 +1289,7 @@ struct vm_struct *get_vm_area(unsigned l
+@@ -1297,6 +1298,7 @@ struct vm_struct *get_vm_area(unsigned l
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
-1, GFP_KERNEL, __builtin_return_address(0));
}
@@ -122,7 +122,7 @@
void *caller)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -728,6 +728,7 @@ extern void show_free_areas(void);
+@@ -732,6 +732,7 @@ extern void show_free_areas(void);
int shmem_lock(struct file *file, int lock, struct user_struct *user);
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);