linux/generic: refresh 2.6.36 kernel patches
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-2.6.36 / 980-vm_exports.patch
1 --- a/mm/shmem.c
2 +++ b/mm/shmem.c
3 @@ -30,6 +30,7 @@
4 #include <linux/module.h>
5 #include <linux/percpu_counter.h>
6 #include <linux/swap.h>
7 +#include <linux/ima.h>
8
9 static struct vfsmount *shm_mnt;
10
11 @@ -2702,6 +2703,16 @@ out:
12
13 /* common code */
14
15 +void shmem_set_file(struct vm_area_struct *vma, struct file *file)
16 +{
17 + ima_counts_get(file);
18 + if (vma->vm_file)
19 + fput(vma->vm_file);
20 + vma->vm_file = file;
21 + vma->vm_ops = &shmem_vm_ops;
22 +}
23 +EXPORT_SYMBOL_GPL(shmem_set_file);
24 +
25 /**
26 * shmem_file_setup - get an unlinked file living in tmpfs
27 * @name: name for dentry (to be seen in /proc/<pid>/maps
28 @@ -2779,9 +2790,6 @@ int shmem_zero_setup(struct vm_area_stru
29 if (IS_ERR(file))
30 return PTR_ERR(file);
31
32 - if (vma->vm_file)
33 - fput(vma->vm_file);
34 - vma->vm_file = file;
35 - vma->vm_ops = &shmem_vm_ops;
36 + shmem_set_file(vma, file);
37 return 0;
38 }
39 --- a/fs/file.c
40 +++ b/fs/file.c
41 @@ -264,6 +264,7 @@ int expand_files(struct files_struct *fi
42 /* All good, so we try */
43 return expand_fdtable(files, nr);
44 }
45 +EXPORT_SYMBOL_GPL(expand_files);
46
47 static int count_open_files(struct fdtable *fdt)
48 {
49 --- a/kernel/exit.c
50 +++ b/kernel/exit.c
51 @@ -506,6 +506,7 @@ struct files_struct *get_files_struct(st
52
53 return files;
54 }
55 +EXPORT_SYMBOL_GPL(get_files_struct);
56
57 void put_files_struct(struct files_struct *files)
58 {
59 @@ -527,6 +528,7 @@ void put_files_struct(struct files_struc
60 rcu_read_unlock();
61 }
62 }
63 +EXPORT_SYMBOL_GPL(put_files_struct);
64
65 void reset_files_struct(struct files_struct *files)
66 {
67 --- a/kernel/fork.c
68 +++ b/kernel/fork.c
69 @@ -190,6 +190,7 @@ void __put_task_struct(struct task_struc
70 if (!profile_handoff_task(tsk))
71 free_task(tsk);
72 }
73 +EXPORT_SYMBOL_GPL(__put_task_struct);
74
75 /*
76 * macro override instead of weak attribute alias, to workaround
77 --- a/kernel/sched.c
78 +++ b/kernel/sched.c
79 @@ -4446,6 +4446,7 @@ int can_nice(const struct task_struct *p
80 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
81 capable(CAP_SYS_NICE));
82 }
83 +EXPORT_SYMBOL_GPL(can_nice);
84
85 #ifdef __ARCH_WANT_SYS_NICE
86
87 --- a/mm/memory.c
88 +++ b/mm/memory.c
89 @@ -1201,6 +1201,7 @@ unsigned long zap_page_range(struct vm_a
90 tlb_finish_mmu(tlb, address, end);
91 return end;
92 }
93 +EXPORT_SYMBOL_GPL(zap_page_range);
94
95 /**
96 * zap_vma_ptes - remove ptes mapping the vma
97 @@ -2612,6 +2613,7 @@ int vmtruncate_range(struct inode *inode
98
99 return 0;
100 }
101 +EXPORT_SYMBOL_GPL(vmtruncate_range);
102
103 /*
104 * We enter with non-exclusive mmap_sem (to exclude vma changes,
105 --- a/mm/vmalloc.c
106 +++ b/mm/vmalloc.c
107 @@ -1177,6 +1177,7 @@ void unmap_kernel_range(unsigned long ad
108 vunmap_page_range(addr, end);
109 flush_tlb_kernel_range(addr, end);
110 }
111 +EXPORT_SYMBOL_GPL(unmap_kernel_range);
112
113 int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
114 {
115 @@ -1292,6 +1293,7 @@ struct vm_struct *get_vm_area(unsigned l
116 return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
117 -1, GFP_KERNEL, __builtin_return_address(0));
118 }
119 +EXPORT_SYMBOL_GPL(get_vm_area);
120
121 struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
122 void *caller)
123 --- a/include/linux/mm.h
124 +++ b/include/linux/mm.h
125 @@ -736,6 +736,7 @@ extern void show_free_areas(void);
126
127 int shmem_lock(struct file *file, int lock, struct user_struct *user);
128 struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
129 +void shmem_set_file(struct vm_area_struct *vma, struct file *file);
130 int shmem_zero_setup(struct vm_area_struct *);
131
132 #ifndef CONFIG_MMU
133 --- a/kernel/signal.c
134 +++ b/kernel/signal.c
135 @@ -1124,6 +1124,7 @@ struct sighand_struct *lock_task_sighand
136
137 return sighand;
138 }
139 +EXPORT_SYMBOL(lock_task_sighand);
140
141 /*
142 * send signal info to all the members of a group