generic: improve MIPS kexec support

[openwrt.git] / target / linux / generic / patches-3.0 / 950-vm_exports.patch

diff --git a/target/linux/generic/patches-3.0/950-vm_exports.patch b/target/linux/generic/patches-3.0/950-vm_exports.patch
index e1b88a0..7e80ced 100644 (file)
--- a/target/linux/generic/patches-3.0/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.0/950-vm_exports.patch
@@ -61,7 +61,7 @@
  {
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
  {
 --- a/kernel/sched.c
 +++ b/kernel/sched.c

-@@ -4937,6 +4937,7 @@ int can_nice(const struct task_struct *p
+@@ -4923,6 +4923,7 @@ int can_nice(const struct task_struct *p

        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }
        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }


@@ -89,7 +89,7 @@
   * We enter with non-exclusive mmap_sem (to exclude vma changes,
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
   * We enter with non-exclusive mmap_sem (to exclude vma changes,
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c

-@@ -1245,6 +1245,7 @@ void unmap_kernel_range(unsigned long ad
+@@ -1246,6 +1246,7 @@ void unmap_kernel_range(unsigned long ad

        vunmap_page_range(addr, end);
        flush_tlb_kernel_range(addr, end);
  }
        vunmap_page_range(addr, end);
        flush_tlb_kernel_range(addr, end);
  }


@@ -97,7 +97,7 @@
  
  int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
  {
  
  int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
  {

-@@ -1360,6 +1361,7 @@ struct vm_struct *get_vm_area(unsigned l
+@@ -1383,6 +1384,7 @@ struct vm_struct *get_vm_area(unsigned l

        return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
                                -1, GFP_KERNEL, __builtin_return_address(0));
  }
        return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
                                -1, GFP_KERNEL, __builtin_return_address(0));
  }


@@ -107,7 +107,7 @@
                                void *caller)
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
                                void *caller)
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h

-@@ -871,6 +871,7 @@ extern bool skip_free_areas_node(unsigne
+@@ -870,6 +870,7 @@ extern bool skip_free_areas_node(unsigne

  
  int shmem_lock(struct file *file, int lock, struct user_struct *user);
  struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
  
  int shmem_lock(struct file *file, int lock, struct user_struct *user);
  struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);