diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2011-01-21 17:52:22 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2011-01-21 17:52:22 +0000 |
commit | c700e57cc7b1ec4cd15dc1d5342bc9053308b8b8 (patch) | |
tree | fffe1ce8f0bbf431763fbb40f3388dc5e1d4ed8b /target/linux/generic/patches-2.6.38/980-vm_exports.patch | |
parent | 02bf1599a3b87a41686bf1cb78d62fe71040b192 (diff) | |
download | upstream-c700e57cc7b1ec4cd15dc1d5342bc9053308b8b8.tar.gz upstream-c700e57cc7b1ec4cd15dc1d5342bc9053308b8b8.tar.bz2 upstream-c700e57cc7b1ec4cd15dc1d5342bc9053308b8b8.zip |
preliminary 2.6.38 support
SVN-Revision: 25057
Diffstat (limited to 'target/linux/generic/patches-2.6.38/980-vm_exports.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.38/980-vm_exports.patch | 132 |
1 files changed, 132 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.38/980-vm_exports.patch b/target/linux/generic/patches-2.6.38/980-vm_exports.patch new file mode 100644 index 0000000000..37a4dd0063 --- /dev/null +++ b/target/linux/generic/patches-2.6.38/980-vm_exports.patch @@ -0,0 +1,132 @@ +--- a/mm/shmem.c ++++ b/mm/shmem.c +@@ -30,6 +30,7 @@ + #include <linux/module.h> + #include <linux/percpu_counter.h> + #include <linux/swap.h> ++#include <linux/ima.h> + + static struct vfsmount *shm_mnt; + +@@ -2710,6 +2711,16 @@ out: + + /* common code */ + ++void shmem_set_file(struct vm_area_struct *vma, struct file *file) ++{ ++ ima_counts_get(file); ++ if (vma->vm_file) ++ fput(vma->vm_file); ++ vma->vm_file = file; ++ vma->vm_ops = &shmem_vm_ops; ++} ++EXPORT_SYMBOL_GPL(shmem_set_file); ++ + /** + * shmem_file_setup - get an unlinked file living in tmpfs + * @name: name for dentry (to be seen in /proc/<pid>/maps +@@ -2787,9 +2798,6 @@ int shmem_zero_setup(struct vm_area_stru + if (IS_ERR(file)) + return PTR_ERR(file); + +- if (vma->vm_file) +- fput(vma->vm_file); +- vma->vm_file = file; +- vma->vm_ops = &shmem_vm_ops; ++ shmem_set_file(vma, file); + return 0; + } +--- a/fs/file.c ++++ b/fs/file.c +@@ -264,6 +264,7 @@ int expand_files(struct files_struct *fi + /* All good, so we try */ + return expand_fdtable(files, nr); + } ++EXPORT_SYMBOL_GPL(expand_files); + + static int count_open_files(struct fdtable *fdt) + { +--- a/kernel/exit.c ++++ b/kernel/exit.c +@@ -513,6 +513,7 @@ struct files_struct *get_files_struct(st + + return files; + } ++EXPORT_SYMBOL_GPL(get_files_struct); + + void put_files_struct(struct files_struct *files) + { +@@ -534,6 +535,7 @@ void put_files_struct(struct files_struc + rcu_read_unlock(); + } + } ++EXPORT_SYMBOL_GPL(put_files_struct); + + void reset_files_struct(struct files_struct *files) + { +--- a/kernel/fork.c ++++ b/kernel/fork.c +@@ -193,6 +193,7 @@ void __put_task_struct(struct task_struc + if (!profile_handoff_task(tsk)) + free_task(tsk); + } ++EXPORT_SYMBOL_GPL(__put_task_struct); + + /* + * macro override instead of weak attribute alias, to workaround +--- a/kernel/sched.c ++++ b/kernel/sched.c +@@ -4640,6 +4640,7 @@ int can_nice(const struct task_struct *p + return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || + capable(CAP_SYS_NICE)); + } ++EXPORT_SYMBOL_GPL(can_nice); + + #ifdef __ARCH_WANT_SYS_NICE + +--- a/mm/memory.c ++++ b/mm/memory.c +@@ -1229,6 +1229,7 @@ unsigned long zap_page_range(struct vm_a + tlb_finish_mmu(tlb, address, end); + return end; + } ++EXPORT_SYMBOL_GPL(zap_page_range); + + /** + * zap_vma_ptes - remove ptes mapping the vma +@@ -2692,6 +2693,7 @@ int vmtruncate_range(struct inode *inode + + return 0; + } ++EXPORT_SYMBOL_GPL(vmtruncate_range); + + /* + * We enter with non-exclusive mmap_sem (to exclude vma changes, +--- a/mm/vmalloc.c ++++ b/mm/vmalloc.c +@@ -1193,6 +1193,7 @@ void unmap_kernel_range(unsigned long ad + vunmap_page_range(addr, end); + flush_tlb_kernel_range(addr, end); + } ++EXPORT_SYMBOL_GPL(unmap_kernel_range); + + int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages) + { +@@ -1308,6 +1309,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)); + } ++EXPORT_SYMBOL_GPL(get_vm_area); + + struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags, + void *caller) +--- a/include/linux/mm.h ++++ b/include/linux/mm.h +@@ -854,6 +854,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); ++void shmem_set_file(struct vm_area_struct *vma, struct file *file); + int shmem_zero_setup(struct vm_area_struct *); + + #ifndef CONFIG_MMU |