[kernel] resync kernel patches
authorHauke Mehrtens <hauke@hauke-m.de>
Thu, 19 Mar 2009 13:05:05 +0000 (13:05 +0000)
committerHauke Mehrtens <hauke@hauke-m.de>
Thu, 19 Mar 2009 13:05:05 +0000 (13:05 +0000)
SVN-Revision: 14949

target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch

index d3e65f7..310d0fc 100644 (file)
  #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
  #endif
-@@ -1813,6 +1817,10 @@ static inline void __nf_copy(struct sk_b
+@@ -1804,6 +1808,10 @@ static inline void __nf_copy(struct sk_b
        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
  #endif
index 3acf980..8168742 100644 (file)
@@ -95,7 +95,7 @@
   * We enter with non-exclusive mmap_sem (to exclude vma changes,
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
-@@ -992,6 +992,7 @@ void unmap_kernel_range(unsigned long ad
+@@ -1002,6 +1002,7 @@ void unmap_kernel_range(unsigned long ad
        vunmap_page_range(addr, end);
        flush_tlb_kernel_range(addr, end);
  }
  
  int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
  {
-@@ -1097,6 +1098,7 @@ struct vm_struct *get_vm_area(unsigned l
+@@ -1107,6 +1108,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));
  }