diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2009-03-19 13:05:05 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2009-03-19 13:05:05 +0000 |
| commit | ac06320936659f7ee911eb895443d0d09f286160 (patch) | |
| tree | 9cff8a5f67ba535541a96620925935584f24e102 | |
| parent | 1b15bd6d80dfe90f625ab7e6a7e3529c078e5618 (diff) | |
| download | master-187ad058-ac06320936659f7ee911eb895443d0d09f286160.tar.gz master-187ad058-ac06320936659f7ee911eb895443d0d09f286160.tar.bz2 master-187ad058-ac06320936659f7ee911eb895443d0d09f286160.zip | |
[kernel] resync kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14949 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch index d3e65f78b2..310d0fc966 100644 --- a/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch @@ -664,7 +664,7 @@ #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 diff --git a/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch index 3acf980a85..8168742eba 100644 --- a/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch +++ b/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch @@ -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); } @@ -103,7 +103,7 @@ 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)); } |