summaryrefslogtreecommitdiff
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-03-19 13:05:05 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-03-19 13:05:05 +0000
commitdfd7233c8bae9cc1c5524e94fac6b3c72ac04adf (patch)
tree9e927c81620b6547bc74e0df803007d245c2c4fd /target/linux/generic-2.6
parent76fe41a8d3337c5f1c6753541cc19fa06af036ed (diff)
downloadmtk-20170518-dfd7233c8bae9cc1c5524e94fac6b3c72ac04adf.zip
mtk-20170518-dfd7233c8bae9cc1c5524e94fac6b3c72ac04adf.tar.gz
mtk-20170518-dfd7233c8bae9cc1c5524e94fac6b3c72ac04adf.tar.bz2
resync kernel patches
SVN-Revision: 14949
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch4
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 d3e65f7..310d0fc 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 3acf980..8168742 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));
}