X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/27c303501e47f15ba64569c28b1a1a125ba1714b..19b6acd0905aef3f8718e694c0264ef5ddcf6403:/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch

diff --git a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
index ca2f052a4..eaf89da3f 100644
--- a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
@@ -1,6 +1,6 @@
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
-@@ -2587,6 +2587,16 @@ int shmem_unuse(swp_entry_t entry, struc
+@@ -2606,6 +2606,16 @@ int shmem_unuse(swp_entry_t entry, struc
  
  /* common code */
  
@@ -17,7 +17,7 @@
  /**
   * shmem_file_setup - get an unlinked file living in tmpfs
   * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2665,11 +2675,7 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2684,11 +2694,7 @@ int shmem_zero_setup(struct vm_area_stru
  	if (IS_ERR(file))
  		return PTR_ERR(file);
  
@@ -70,7 +70,7 @@
   * macro override instead of weak attribute alias, to workaround
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
-@@ -5600,6 +5600,7 @@ int can_nice(const struct task_struct *p
+@@ -5666,6 +5666,7 @@ int can_nice(const struct task_struct *p
  	return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
  		capable(CAP_SYS_NICE));
  }
@@ -88,7 +88,7 @@
  
  /**
   * zap_vma_ptes - remove ptes mapping the vma
-@@ -2405,6 +2406,7 @@ int vmtruncate_range(struct inode *inode
+@@ -2438,6 +2439,7 @@ int vmtruncate_range(struct inode *inode
  
  	return 0;
  }
@@ -98,7 +98,7 @@
   * We enter with non-exclusive mmap_sem (to exclude vma changes,
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
-@@ -1100,6 +1100,7 @@ void unmap_kernel_range(unsigned long ad
+@@ -1101,6 +1101,7 @@ void unmap_kernel_range(unsigned long ad
  	vunmap_page_range(addr, end);
  	flush_tlb_kernel_range(addr, end);
  }
@@ -106,7 +106,7 @@
  
  int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
  {
-@@ -1213,6 +1214,7 @@ struct vm_struct *get_vm_area(unsigned l
+@@ -1214,6 +1215,7 @@ struct vm_struct *get_vm_area(unsigned l
  	return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END,
  				-1, GFP_KERNEL, __builtin_return_address(0));
  }
@@ -114,3 +114,23 @@
  
  struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
  				void *caller)
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -726,6 +726,7 @@ static inline int shmem_lock(struct file
+ #endif
+ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags);
+ 
++void shmem_set_file(struct vm_area_struct *vma, struct file *file);
+ int shmem_zero_setup(struct vm_area_struct *);
+ 
+ #ifndef CONFIG_MMU
+--- a/kernel/signal.c
++++ b/kernel/signal.c
+@@ -1053,6 +1053,7 @@ struct sighand_struct *lock_task_sighand
+ 
+ 	return sighand;
+ }
++EXPORT_SYMBOL(lock_task_sighand);
+ 
+ /*
+  * send signal info to all the members of a group