cns3xxx: sync kernel config
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-2.6.39 / 950-vm_exports.patch
1 --- a/mm/shmem.c
2 +++ b/mm/shmem.c
3 @@ -2943,6 +2943,16 @@ out:
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 + vma->vm_flags |= VM_CAN_NONLINEAR;
14 +}
15 +EXPORT_SYMBOL_GPL(shmem_set_file);
16 +
17 /**
18 * shmem_file_setup - get an unlinked file living in tmpfs
19 * @name: name for dentry (to be seen in /proc/<pid>/maps
20 @@ -3020,10 +3030,7 @@ int shmem_zero_setup(struct vm_area_stru
21 if (IS_ERR(file))
22 return PTR_ERR(file);
23
24 - if (vma->vm_file)
25 - fput(vma->vm_file);
26 - vma->vm_file = file;
27 - vma->vm_ops = &shmem_vm_ops;
28 - vma->vm_flags |= VM_CAN_NONLINEAR;
29 + shmem_set_file(vma, file);
30 +
31 return 0;
32 }
33 --- a/fs/file.c
34 +++ b/fs/file.c
35 @@ -268,6 +268,7 @@ int expand_files(struct files_struct *fi
36 /* All good, so we try */
37 return expand_fdtable(files, nr);
38 }
39 +EXPORT_SYMBOL_GPL(expand_files);
40
41 static int count_open_files(struct fdtable *fdt)
42 {
43 --- a/kernel/exit.c
44 +++ b/kernel/exit.c
45 @@ -513,6 +513,7 @@ struct files_struct *get_files_struct(st
46
47 return files;
48 }
49 +EXPORT_SYMBOL_GPL(get_files_struct);
50
51 void put_files_struct(struct files_struct *files)
52 {
53 @@ -534,6 +535,7 @@ void put_files_struct(struct files_struc
54 rcu_read_unlock();
55 }
56 }
57 +EXPORT_SYMBOL_GPL(put_files_struct);
58
59 void reset_files_struct(struct files_struct *files)
60 {
61 --- a/kernel/sched.c
62 +++ b/kernel/sched.c
63 @@ -4781,6 +4781,7 @@ int can_nice(const struct task_struct *p
64 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
65 capable(CAP_SYS_NICE));
66 }
67 +EXPORT_SYMBOL_GPL(can_nice);
68
69 #ifdef __ARCH_WANT_SYS_NICE
70
71 --- a/mm/memory.c
72 +++ b/mm/memory.c
73 @@ -1229,6 +1229,7 @@ unsigned long zap_page_range(struct vm_a
74 tlb_finish_mmu(tlb, address, end);
75 return end;
76 }
77 +EXPORT_SYMBOL_GPL(zap_page_range);
78
79 /**
80 * zap_vma_ptes - remove ptes mapping the vma
81 @@ -2763,6 +2764,7 @@ int vmtruncate_range(struct inode *inode
82
83 return 0;
84 }
85 +EXPORT_SYMBOL_GPL(vmtruncate_range);
86
87 /*
88 * We enter with non-exclusive mmap_sem (to exclude vma changes,
89 --- a/mm/vmalloc.c
90 +++ b/mm/vmalloc.c
91 @@ -1245,6 +1245,7 @@ void unmap_kernel_range(unsigned long ad
92 vunmap_page_range(addr, end);
93 flush_tlb_kernel_range(addr, end);
94 }
95 +EXPORT_SYMBOL_GPL(unmap_kernel_range);
96
97 int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
98 {
99 @@ -1360,6 +1361,7 @@ struct vm_struct *get_vm_area(unsigned l
100 return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
101 -1, GFP_KERNEL, __builtin_return_address(0));
102 }
103 +EXPORT_SYMBOL_GPL(get_vm_area);
104
105 struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
106 void *caller)
107 --- a/include/linux/mm.h
108 +++ b/include/linux/mm.h
109 @@ -872,6 +872,7 @@ extern void __show_free_areas(unsigned i
110
111 int shmem_lock(struct file *file, int lock, struct user_struct *user);
112 struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
113 +void shmem_set_file(struct vm_area_struct *vma, struct file *file);
114 int shmem_zero_setup(struct vm_area_struct *);
115
116 #ifndef CONFIG_MMU