when changing the mac address of a bridge interface, keep member interface addresses...

[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 4c3b561..c226ac7 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
@@ -1,6 +1,6 @@
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
 --- a/mm/shmem.c
 +++ b/mm/shmem.c

-@@ -2775,6 +2775,16 @@ int shmem_lock(struct file *file, int lo
+@@ -2608,6 +2608,16 @@ int shmem_lock(struct file *file, int lo

  
  /* common code */
  
  
  /* 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
  /**
   * shmem_file_setup - get an unlinked file living in tmpfs
   * @name: name for dentry (to be seen in /proc/<pid>/maps

-@@ -2854,9 +2864,6 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2687,9 +2697,6 @@ int shmem_zero_setup(struct vm_area_stru

        if (IS_ERR(file))
                return PTR_ERR(file);
  
        if (IS_ERR(file))
                return PTR_ERR(file);
  


@@ -40,7 +40,7 @@
  {
 --- a/kernel/exit.c
 +++ b/kernel/exit.c
  {
 --- a/kernel/exit.c
 +++ b/kernel/exit.c

-@@ -510,6 +510,7 @@ struct files_struct *get_files_struct(st
+@@ -507,6 +507,7 @@ struct files_struct *get_files_struct(st

  
        return files;
  }
  
        return files;
  }


@@ -48,7 +48,7 @@
  
  void put_files_struct(struct files_struct *files)
  {
  
  void put_files_struct(struct files_struct *files)
  {

-@@ -529,6 +530,7 @@ void put_files_struct(struct files_struc
+@@ -526,6 +527,7 @@ void put_files_struct(struct files_struc

                free_fdtable(fdt);
        }
  }
                free_fdtable(fdt);
        }
  }


@@ -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

-@@ -6046,6 +6046,7 @@ int can_nice(const struct task_struct *p
+@@ -6113,6 +6113,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));
  }


@@ -78,7 +78,7 @@
  
 --- a/mm/memory.c
 +++ b/mm/memory.c
  
 --- a/mm/memory.c
 +++ b/mm/memory.c

-@@ -1097,6 +1097,7 @@ unsigned long zap_page_range(struct vm_a
+@@ -1100,6 +1100,7 @@ unsigned long zap_page_range(struct vm_a

                tlb_finish_mmu(tlb, address, end);
        return end;
  }
                tlb_finish_mmu(tlb, address, end);
        return end;
  }


@@ -86,7 +86,7 @@
  
  /**
   * zap_vma_ptes - remove ptes mapping the vma
  
  /**
   * zap_vma_ptes - remove ptes mapping the vma

-@@ -2483,6 +2484,7 @@ int vmtruncate_range(struct inode *inode
+@@ -2486,6 +2487,7 @@ int vmtruncate_range(struct inode *inode

  
        return 0;
  }
  
        return 0;
  }


@@ -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;
  }