mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-06 02:37:10 +02:00
7617db12cb
Also refresh the affected patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34402 3c298f89-4303-0410-b956-a3cf2f4a3e73
111 lines
3.1 KiB
Diff
111 lines
3.1 KiB
Diff
--- a/mm/shmem.c
|
|
+++ b/mm/shmem.c
|
|
@@ -2914,6 +2914,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
|
|
@@ -2991,11 +3001,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
|
|
@@ -269,6 +269,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/sched/core.c
|
|
+++ b/kernel/sched/core.c
|
|
@@ -4106,6 +4106,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
|
|
@@ -1408,6 +1408,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
|
|
@@ -46,6 +46,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);
|