mirror of https://github.com/hak5/openwrt.git
kernel: remove the obsolete vm_exports patch
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43565lede-17.01
parent
9a495f6bbb
commit
14a163ca58
|
@ -1,101 +0,0 @@
|
|||
--- a/mm/shmem.c
|
||||
+++ b/mm/shmem.c
|
||||
@@ -2965,6 +2965,15 @@ static struct dentry_operations anon_ops
|
||||
.d_dname = simple_dname
|
||||
};
|
||||
|
||||
+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_file_setup - get an unlinked file living in tmpfs
|
||||
* @name: name for dentry (to be seen in /proc/<pid>/maps
|
||||
@@ -3038,11 +3047,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
|
||||
@@ -218,6 +218,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
|
||||
@@ -502,6 +502,8 @@ static void exit_mm(struct task_struct *
|
||||
mm_update_next_owner(mm);
|
||||
mmput(mm);
|
||||
}
|
||||
+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
|
||||
@@ -3719,6 +3719,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
|
||||
@@ -1413,6 +1413,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
|
||||
@@ -1281,6 +1281,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)
|
||||
{
|
||||
@@ -1412,6 +1413,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
|
||||
@@ -47,6 +47,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 int shmem_zero_setup(struct vm_area_struct *);
|
||||
extern int shmem_lock(struct file *file, int lock, struct user_struct *user);
|
||||
extern void shmem_unlock_mapping(struct address_space *mapping);
|
|
@ -1,101 +0,0 @@
|
|||
--- a/mm/shmem.c
|
||||
+++ b/mm/shmem.c
|
||||
@@ -2974,6 +2974,15 @@ put_memory:
|
||||
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
|
||||
@@ -3013,11 +3022,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
|
||||
@@ -218,6 +218,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
|
||||
@@ -490,6 +490,8 @@ static void exit_mm(struct task_struct *
|
||||
mm_update_next_owner(mm);
|
||||
mmput(mm);
|
||||
}
|
||||
+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
|
||||
@@ -2896,6 +2896,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
|
||||
@@ -1391,6 +1391,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
|
||||
@@ -1260,6 +1260,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)
|
||||
{
|
||||
@@ -1367,6 +1368,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
|
||||
@@ -47,6 +47,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 *);
|
|
@ -1,101 +0,0 @@
|
|||
--- a/mm/shmem.c
|
||||
+++ b/mm/shmem.c
|
||||
@@ -2985,6 +2985,15 @@ put_memory:
|
||||
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
|
||||
@@ -3024,11 +3033,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
|
||||
@@ -218,6 +218,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
|
||||
@@ -491,6 +491,8 @@ static void exit_mm(struct task_struct *
|
||||
mm_update_next_owner(mm);
|
||||
mmput(mm);
|
||||
}
|
||||
+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
|
||||
@@ -3056,6 +3056,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
|
||||
@@ -1392,6 +1392,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
|
||||
@@ -1260,6 +1260,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)
|
||||
{
|
||||
@@ -1367,6 +1368,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
|
||||
@@ -47,6 +47,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 *);
|
|
@ -1,93 +0,0 @@
|
|||
--- 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
|
||||
@@ -3159,6 +3159,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
|
||||
@@ -1404,6 +1404,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
|
||||
@@ -1372,6 +1372,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 *);
|
|
@ -1,117 +0,0 @@
|
|||
--- a/mm/shmem.c
|
||||
+++ b/mm/shmem.c
|
||||
@@ -2490,6 +2490,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
|
||||
|
||||
/* common code */
|
||||
|
||||
+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;
|
||||
+ vma->vm_flags |= VM_CAN_NONLINEAR;
|
||||
+}
|
||||
+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
|
||||
@@ -2567,11 +2577,8 @@ 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;
|
||||
- vma->vm_flags |= VM_CAN_NONLINEAR;
|
||||
+ shmem_set_file(vma, file);
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
--- a/fs/file.c
|
||||
+++ b/fs/file.c
|
||||
@@ -268,6 +268,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
|
||||
@@ -500,6 +500,7 @@ struct files_struct *get_files_struct(st
|
||||
|
||||
return files;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(get_files_struct);
|
||||
|
||||
void put_files_struct(struct files_struct *files)
|
||||
{
|
||||
@@ -521,6 +522,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/sched/core.c
|
||||
+++ b/kernel/sched/core.c
|
||||
@@ -3854,6 +3854,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
|
||||
@@ -1412,6 +1412,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
|
||||
@@ -3087,6 +3088,7 @@ static inline int check_stack_guard_page
|
||||
}
|
||||
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
|
||||
@@ -1257,6 +1257,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)
|
||||
{
|
||||
@@ -1394,6 +1395,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
|
||||
@@ -872,6 +872,7 @@ extern bool skip_free_areas_node(unsigne
|
||||
|
||||
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 *);
|
||||
|
||||
extern int can_do_mlock(void);
|
|
@ -1,101 +0,0 @@
|
|||
--- a/mm/shmem.c
|
||||
+++ b/mm/shmem.c
|
||||
@@ -2871,6 +2871,15 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
|
||||
|
||||
/* common code */
|
||||
|
||||
+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_file_setup - get an unlinked file living in tmpfs
|
||||
* @name: name for dentry (to be seen in /proc/<pid>/maps
|
||||
@@ -2947,11 +2956,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
|
||||
@@ -270,6 +270,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
|
||||
@@ -499,6 +499,8 @@ static void exit_mm(struct task_struct *
|
||||
mm_update_next_owner(mm);
|
||||
mmput(mm);
|
||||
}
|
||||
+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
|
||||
@@ -3636,6 +3636,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
|
||||
@@ -1409,6 +1409,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
|
||||
@@ -1266,6 +1266,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)
|
||||
{
|
||||
@@ -1403,6 +1404,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,
|
||||
const void *caller)
|
||||
--- a/include/linux/shmem_fs.h
|
||||
+++ b/include/linux/shmem_fs.h
|
||||
@@ -47,6 +47,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 int shmem_zero_setup(struct vm_area_struct *);
|
||||
extern int shmem_lock(struct file *file, int lock, struct user_struct *user);
|
||||
extern void shmem_unlock_mapping(struct address_space *mapping);
|
Loading…
Reference in New Issue