summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-02-08 13:01:28 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-02-08 13:01:28 +0000
commit7efebe60e89ec6d0c9630affe04d8892c574553b (patch)
treec2faa2aa2d08b2eaf3d4ff4af5d23cf6f7d76480 /target/linux/generic-2.6
parent4736491e6207bcda53f2c5bb8c6d5a47cfc7be4d (diff)
[kernel] update to 2.6.28.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14441 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/960-fix-serial_h-includes.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch4
3 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch
index 44f9fcb18..914441712 100644
--- a/target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch
@@ -8,7 +8,7 @@
depends on NETFILTER_ADVANCED
help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -488,7 +487,6 @@ config NETFILTER_XT_TARGET_TARPIT
+@@ -455,7 +454,6 @@ config NETFILTER_XT_TARGET_SECMARK
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'
diff --git a/target/linux/generic-2.6/patches-2.6.28/960-fix-serial_h-includes.patch b/target/linux/generic-2.6/patches-2.6.28/960-fix-serial_h-includes.patch
index 38ddc4e7e..093ff590b 100644
--- a/target/linux/generic-2.6/patches-2.6.28/960-fix-serial_h-includes.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/960-fix-serial_h-includes.patch
@@ -5,8 +5,6 @@ Date: Tue Feb 3 00:16:19 2009 +0100
struct serial_rs485 contains __32 fields and is exported to userspace so it
needs linux/types.h in userspace aswell.
-diff --git a/include/linux/serial.h b/include/linux/serial.h
-index 1ea8d92..fa72b39 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -10,8 +10,8 @@
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 e0c7387cf..076102e26 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
-@@ -981,6 +981,7 @@ void unmap_kernel_range(unsigned long ad
+@@ -992,6 +992,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)
{
-@@ -1086,6 +1087,7 @@ struct vm_struct *get_vm_area(unsigned l
+@@ -1097,6 +1098,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));
}