[kernel] export rescan_partitions to prevent linking failures in block2mtd (#6741)

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.32 / 980-vm_exports.patch

diff --git a/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch
index 724b1f0..efaa209 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch
@@ -68,7 +68,7 @@
   * macro override instead of weak attribute alias, to workaround
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
   * macro override instead of weak attribute alias, to workaround
 --- a/kernel/sched.c
 +++ b/kernel/sched.c

-@@ -6095,6 +6095,7 @@ int can_nice(const struct task_struct *p
+@@ -6093,6 +6093,7 @@ int can_nice(const struct task_struct *p

        return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
                capable(CAP_SYS_NICE));
  }
        return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
                capable(CAP_SYS_NICE));
  }


@@ -96,7 +96,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

-@@ -1113,6 +1113,7 @@ void unmap_kernel_range(unsigned long ad
+@@ -1172,6 +1172,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);
  }


@@ -104,7 +104,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)
  {

-@@ -1228,6 +1229,7 @@ struct vm_struct *get_vm_area(unsigned l
+@@ -1287,6 +1288,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));
  }


@@ -124,7 +124,7 @@
  #ifndef CONFIG_MMU
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
  #ifndef CONFIG_MMU
 --- a/kernel/signal.c
 +++ b/kernel/signal.c

-@@ -1069,6 +1069,7 @@ struct sighand_struct *lock_task_sighand
+@@ -1070,6 +1070,7 @@ struct sighand_struct *lock_task_sighand

  
        return sighand;
  }
  
        return sighand;
  }