[generic]: add 3.7-rc6 support (patch 820 still has to be fixed)
[openwrt.git] / target / linux / generic / patches-3.7 / 950-vm_exports.patch
1 --- a/mm/shmem.c
2 +++ b/mm/shmem.c
3 @@ -2769,6 +2769,15 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
4  
5  /* common code */
6  
7 +void shmem_set_file(struct vm_area_struct *vma, struct file *file)
8 +{
9 +       if (vma->vm_file)
10 +               fput(vma->vm_file);
11 +       vma->vm_file = file;
12 +       vma->vm_ops = &shmem_vm_ops;
13 +}
14 +EXPORT_SYMBOL_GPL(shmem_set_file);
15 +
16  /**
17   * shmem_file_setup - get an unlinked file living in tmpfs
18   * @name: name for dentry (to be seen in /proc/<pid>/maps
19 @@ -2845,11 +2854,8 @@ int shmem_zero_setup(struct vm_area_stru
20         file = shmem_file_setup("dev/zero", size, vma->vm_flags);
21         if (IS_ERR(file))
22                 return PTR_ERR(file);
23 +       shmem_set_file(vma, file);
24  
25 -       if (vma->vm_file)
26 -               fput(vma->vm_file);
27 -       vma->vm_file = file;
28 -       vma->vm_ops = &shmem_vm_ops;
29         return 0;
30  }
31  
32 --- a/fs/file.c
33 +++ b/fs/file.c
34 @@ -270,6 +270,7 @@ static inline void __set_open_fd(int fd,
35  {
36         __set_bit(fd, fdt->open_fds);
37  }
38 +EXPORT_SYMBOL_GPL(expand_files);
39  
40  static inline void __clear_open_fd(int fd, struct fdtable *fdt)
41  {
42 --- a/kernel/exit.c
43 +++ b/kernel/exit.c
44 @@ -461,6 +461,7 @@ void daemonize(const char *name, ...)
45  
46         reparent_to_kthreadd();
47  }
48 +EXPORT_SYMBOL_GPL(get_files_struct);
49  
50  EXPORT_SYMBOL(daemonize);
51  
52 @@ -603,6 +604,7 @@ static void exit_mm(struct task_struct *
53         mm_update_next_owner(mm);
54         mmput(mm);
55  }
56 +EXPORT_SYMBOL_GPL(put_files_struct);
57  
58  /*
59   * When we die, we re-parent all our children, and try to:
60 --- a/kernel/sched/core.c
61 +++ b/kernel/sched/core.c
62 @@ -3565,6 +3565,7 @@ int can_nice(const struct task_struct *p
63         return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
64                 capable(CAP_SYS_NICE));
65  }
66 +EXPORT_SYMBOL_GPL(can_nice);
67  
68  #ifdef __ARCH_WANT_SYS_NICE
69  
70 --- a/mm/memory.c
71 +++ b/mm/memory.c
72 @@ -1415,6 +1415,7 @@ void zap_page_range(struct vm_area_struc
73         mmu_notifier_invalidate_range_end(mm, start, end);
74         tlb_finish_mmu(&tlb, start, end);
75  }
76 +EXPORT_SYMBOL_GPL(zap_page_range);
77  
78  /**
79   * zap_page_range_single - remove user pages in a given range
80 --- a/mm/vmalloc.c
81 +++ b/mm/vmalloc.c
82 @@ -1266,6 +1266,7 @@ void unmap_kernel_range(unsigned long ad
83         vunmap_page_range(addr, end);
84         flush_tlb_kernel_range(addr, end);
85  }
86 +EXPORT_SYMBOL_GPL(unmap_kernel_range);
87  
88  int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
89  {
90 @@ -1403,6 +1404,7 @@ struct vm_struct *get_vm_area(unsigned l
91         return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
92                                 -1, GFP_KERNEL, __builtin_return_address(0));
93  }
94 +EXPORT_SYMBOL_GPL(get_vm_area);
95  
96  struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
97                                 const void *caller)
98 --- a/include/linux/shmem_fs.h
99 +++ b/include/linux/shmem_fs.h
100 @@ -47,6 +47,8 @@ extern int shmem_init(void);
101  extern int shmem_fill_super(struct super_block *sb, void *data, int silent);
102  extern struct file *shmem_file_setup(const char *name,
103                                         loff_t size, unsigned long flags);
104 +
105 +extern void shmem_set_file(struct vm_area_struct *vma, struct file *file);
106  extern int shmem_zero_setup(struct vm_area_struct *);
107  extern int shmem_lock(struct file *file, int lock, struct user_struct *user);
108  extern void shmem_unlock_mapping(struct address_space *mapping);