From 1513b39a8c8e21e3f8fbebab9fb4c41040ccf695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 27 Oct 2014 18:14:39 +0000 Subject: kernel: start working on 3.18 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit: 1) Copies 3.14 patches 2) Drops mainlined stuff 3) Modifies some patches to apply Signed-off-by: Rafał Miłecki SVN-Revision: 43093 --- .../generic/patches-3.18/950-vm_exports.patch | 101 +++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 target/linux/generic/patches-3.18/950-vm_exports.patch (limited to 'target/linux/generic/patches-3.18/950-vm_exports.patch') diff --git a/target/linux/generic/patches-3.18/950-vm_exports.patch b/target/linux/generic/patches-3.18/950-vm_exports.patch new file mode 100644 index 0000000000..0b99a3328a --- /dev/null +++ b/target/linux/generic/patches-3.18/950-vm_exports.patch @@ -0,0 +1,101 @@ +--- a/mm/shmem.c ++++ b/mm/shmem.c +@@ -3377,6 +3377,15 @@ put_path: + return res; + } + ++void shmem_set_file(struct vm_area_struct *vma, struct file *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_kernel_file_setup - get an unlinked file living in tmpfs which must be + * kernel internal. There will be NO LSM permission checks against the +@@ -3416,11 +3425,8 @@ int shmem_zero_setup(struct vm_area_stru + file = shmem_file_setup("dev/zero", size, vma->vm_flags); + if (IS_ERR(file)) + return PTR_ERR(file); ++ shmem_set_file(vma, file); + +- if (vma->vm_file) +- fput(vma->vm_file); +- vma->vm_file = file; +- vma->vm_ops = &shmem_vm_ops; + return 0; + } + +--- a/fs/file.c ++++ b/fs/file.c +@@ -216,6 +216,7 @@ static inline void __set_open_fd(int fd, + { + __set_bit(fd, fdt->open_fds); + } ++EXPORT_SYMBOL_GPL(expand_files); + + static inline void __clear_open_fd(int fd, struct fdtable *fdt) + { +--- a/kernel/exit.c ++++ b/kernel/exit.c +@@ -461,6 +461,8 @@ static void exit_mm(struct task_struct * + mmput(mm); + clear_thread_flag(TIF_MEMDIE); + } ++EXPORT_SYMBOL_GPL(get_files_struct); ++EXPORT_SYMBOL_GPL(put_files_struct); + + /* + * When we die, we re-parent all our children, and try to: +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -3147,6 +3147,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 +@@ -1403,6 +1403,7 @@ void zap_page_range(struct vm_area_struc + mmu_notifier_invalidate_range_end(mm, start, end); + tlb_finish_mmu(&tlb, start, end); + } ++EXPORT_SYMBOL_GPL(zap_page_range); + + /** + * zap_page_range_single - remove user pages in a given range +--- a/mm/vmalloc.c ++++ b/mm/vmalloc.c +@@ -1231,6 +1231,7 @@ int map_kernel_range_noflush(unsigned lo + { + return vmap_page_range_noflush(addr, addr + size, prot, pages); + } ++EXPORT_SYMBOL_GPL(unmap_kernel_range); + + /** + * unmap_kernel_range_noflush - unmap kernel VM area +@@ -1372,6 +1373,7 @@ struct vm_struct *get_vm_area(unsigned l + NUMA_NO_NODE, 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, + const void *caller) +--- a/include/linux/shmem_fs.h ++++ b/include/linux/shmem_fs.h +@@ -49,6 +49,8 @@ extern int shmem_init(void); + extern int shmem_fill_super(struct super_block *sb, void *data, int silent); + extern struct file *shmem_file_setup(const char *name, + loff_t size, unsigned long flags); ++ ++extern void shmem_set_file(struct vm_area_struct *vma, struct file *file); + extern struct file *shmem_kernel_file_setup(const char *name, loff_t size, + unsigned long flags); + extern int shmem_zero_setup(struct vm_area_struct *); -- cgit v1.2.3