From: Felix Fietkau Date: Fri, 25 Sep 2009 20:58:40 +0000 (+0000) Subject: kernel: refresh the vm exports patch in 2.6.31 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e0dd793ff577a35bc5ef4e8908cf10f2b6450d24;p=librecmc%2Flibrecmc.git kernel: refresh the vm exports patch in 2.6.31 SVN-Revision: 17727 --- diff --git a/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch index 1b8f3a9307..ed2681b659 100644 --- a/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch +++ b/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch @@ -1,6 +1,6 @@ --- a/mm/shmem.c +++ b/mm/shmem.c -@@ -2602,6 +2602,16 @@ int shmem_unuse(swp_entry_t entry, struc +@@ -2769,6 +2769,16 @@ /* 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//maps -@@ -2681,10 +2691,7 @@ int shmem_zero_setup(struct vm_area_stru +@@ -2848,10 +2858,7 @@ if (IS_ERR(file)) return PTR_ERR(file); @@ -31,7 +31,7 @@ --- a/fs/file.c +++ b/fs/file.c -@@ -270,6 +270,7 @@ int expand_files(struct files_struct *fi +@@ -270,6 +270,7 @@ /* All good, so we try */ return expand_fdtable(files, nr); } @@ -41,7 +41,7 @@ { --- a/kernel/exit.c +++ b/kernel/exit.c -@@ -507,6 +507,7 @@ struct files_struct *get_files_struct(st +@@ -507,6 +507,7 @@ return files; } @@ -49,7 +49,7 @@ void put_files_struct(struct files_struct *files) { -@@ -526,6 +527,7 @@ void put_files_struct(struct files_struc +@@ -526,6 +527,7 @@ free_fdtable(fdt); } } @@ -59,7 +59,7 @@ { --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -159,6 +159,7 @@ void __put_task_struct(struct task_struc +@@ -159,6 +159,7 @@ if (!profile_handoff_task(tsk)) free_task(tsk); } @@ -69,7 +69,7 @@ * macro override instead of weak attribute alias, to workaround --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -5981,6 +5981,7 @@ int can_nice(const struct task_struct *p +@@ -5981,6 +5981,7 @@ return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || capable(CAP_SYS_NICE)); } @@ -79,7 +79,7 @@ --- a/mm/memory.c +++ b/mm/memory.c -@@ -1064,6 +1064,7 @@ unsigned long zap_page_range(struct vm_a +@@ -1064,6 +1064,7 @@ tlb_finish_mmu(tlb, address, end); return end; } @@ -87,7 +87,7 @@ /** * zap_vma_ptes - remove ptes mapping the vma -@@ -2490,6 +2491,7 @@ int vmtruncate_range(struct inode *inode +@@ -2490,6 +2491,7 @@ return 0; } @@ -97,7 +97,7 @@ * We enter with non-exclusive mmap_sem (to exclude vma changes, --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -1101,6 +1101,7 @@ void unmap_kernel_range(unsigned long ad +@@ -1101,6 +1101,7 @@ vunmap_page_range(addr, end); flush_tlb_kernel_range(addr, end); } @@ -105,7 +105,7 @@ int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages) { -@@ -1214,6 +1215,7 @@ struct vm_struct *get_vm_area(unsigned l +@@ -1214,6 +1215,7 @@ return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END, -1, GFP_KERNEL, __builtin_return_address(0)); } @@ -115,7 +115,7 @@ void *caller) --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -711,6 +711,7 @@ static inline int shmem_lock(struct file +@@ -711,6 +711,7 @@ #endif struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags); @@ -125,7 +125,7 @@ #ifndef CONFIG_MMU --- a/kernel/signal.c +++ b/kernel/signal.c -@@ -1061,6 +1061,7 @@ struct sighand_struct *lock_task_sighand +@@ -1061,6 +1061,7 @@ return sighand; }