[kernel] revert 15922 - add back 2.6.29 kernel support
[openwrt.git] / target / linux / generic-2.6 / patches-2.6.29 / 980-vm_exports.patch
1 --- a/mm/shmem.c
2 +++ b/mm/shmem.c
3 @@ -2587,6 +2587,15 @@ int shmem_unuse(swp_entry_t entry, struc
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 @@ -2665,10 +2674,7 @@ int shmem_zero_setup(struct vm_area_stru
20         if (IS_ERR(file))
21                 return PTR_ERR(file);
22  
23 -       if (vma->vm_file)
24 -               fput(vma->vm_file);
25 -       vma->vm_file = file;
26 -       vma->vm_ops = &shmem_vm_ops;
27 +       shmem_set_file(vma, file);
28         return 0;
29  }
30  
31 --- a/fs/file.c
32 +++ b/fs/file.c
33 @@ -270,6 +270,7 @@ int expand_files(struct files_struct *fi
34         /* All good, so we try */
35         return expand_fdtable(files, nr);
36  }
37 +EXPORT_SYMBOL_GPL(expand_files);
38  
39  static int count_open_files(struct fdtable *fdt)
40  {
41 --- a/kernel/exit.c
42 +++ b/kernel/exit.c
43 @@ -516,6 +516,7 @@ struct files_struct *get_files_struct(st
44  
45         return files;
46  }
47 +EXPORT_SYMBOL_GPL(get_files_struct);
48  
49  void put_files_struct(struct files_struct *files)
50  {
51 @@ -535,6 +536,7 @@ void put_files_struct(struct files_struc
52                 free_fdtable(fdt);
53         }
54  }
55 +EXPORT_SYMBOL_GPL(put_files_struct);
56  
57  void reset_files_struct(struct files_struct *files)
58  {
59 --- a/kernel/fork.c
60 +++ b/kernel/fork.c
61 @@ -158,6 +158,7 @@ void __put_task_struct(struct task_struc
62         if (!profile_handoff_task(tsk))
63                 free_task(tsk);
64  }
65 +EXPORT_SYMBOL_GPL(__put_task_struct);
66  
67  /*
68   * macro override instead of weak attribute alias, to workaround
69 --- a/kernel/sched.c
70 +++ b/kernel/sched.c
71 @@ -5178,6 +5178,7 @@ int can_nice(const struct task_struct *p
72         return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
73                 capable(CAP_SYS_NICE));
74  }
75 +EXPORT_SYMBOL_GPL(can_nice);
76  
77  #ifdef __ARCH_WANT_SYS_NICE
78  
79 --- a/mm/memory.c
80 +++ b/mm/memory.c
81 @@ -1063,6 +1063,7 @@ unsigned long zap_page_range(struct vm_a
82                 tlb_finish_mmu(tlb, address, end);
83         return end;
84  }
85 +EXPORT_SYMBOL_GPL(zap_page_range);
86  
87  /**
88   * zap_vma_ptes - remove ptes mapping the vma
89 @@ -2387,6 +2388,7 @@ int vmtruncate_range(struct inode *inode
90  
91         return 0;
92  }
93 +EXPORT_SYMBOL_GPL(vmtruncate_range);
94  
95  /*
96   * We enter with non-exclusive mmap_sem (to exclude vma changes,
97 --- a/mm/vmalloc.c
98 +++ b/mm/vmalloc.c
99 @@ -1025,6 +1025,7 @@ void unmap_kernel_range(unsigned long ad
100         vunmap_page_range(addr, end);
101         flush_tlb_kernel_range(addr, end);
102  }
103 +EXPORT_SYMBOL_GPL(unmap_kernel_range);
104  
105  int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
106  {
107 @@ -1138,6 +1139,7 @@ struct vm_struct *get_vm_area(unsigned l
108         return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END,
109                                 -1, GFP_KERNEL, __builtin_return_address(0));
110  }
111 +EXPORT_SYMBOL_GPL(get_vm_area);
112  
113  struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
114                                 void *caller)