diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2010-11-24 18:50:11 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2010-11-24 18:50:11 +0000 |
| commit | ead8ab8403bfbc0fa588c6590e85c18141fa74a2 (patch) | |
| tree | ba09767c2a0918184d698bc442e6b363437b5483 /target/linux/generic/patches-2.6.36 | |
| parent | 2c63c1543e64ab431ace157d2469e171c7f9205f (diff) | |
| download | upstream-ead8ab8403bfbc0fa588c6590e85c18141fa74a2.tar.gz upstream-ead8ab8403bfbc0fa588c6590e85c18141fa74a2.tar.bz2 upstream-ead8ab8403bfbc0fa588c6590e85c18141fa74a2.zip | |
update to the latest stable kernels
SVN-Revision: 24136
Diffstat (limited to 'target/linux/generic/patches-2.6.36')
3 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-2.6.36/103-netfilter_layer7_2.6.36_fix.patch b/target/linux/generic/patches-2.6.36/103-netfilter_layer7_2.6.36_fix.patch index e9aa3c967f..a2f6ff208f 100644 --- a/target/linux/generic/patches-2.6.36/103-netfilter_layer7_2.6.36_fix.patch +++ b/target/linux/generic/patches-2.6.36/103-netfilter_layer7_2.6.36_fix.patch @@ -1,6 +1,6 @@ --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -781,6 +781,27 @@ config NETFILTER_XT_MATCH_IPVS +@@ -761,6 +761,27 @@ config NETFILTER_XT_MATCH_IPVS If unsure, say N. @@ -28,7 +28,7 @@ config NETFILTER_XT_MATCH_LENGTH tristate '"length" match support' depends on NETFILTER_ADVANCED -@@ -966,26 +987,11 @@ config NETFILTER_XT_MATCH_STATE +@@ -946,26 +967,11 @@ config NETFILTER_XT_MATCH_STATE To compile it as a module, choose M here. If unsure, say N. diff --git a/target/linux/generic/patches-2.6.36/180-netfilter_depends.patch b/target/linux/generic/patches-2.6.36/180-netfilter_depends.patch index 65c4d44c2b..4cf9fcf158 100644 --- a/target/linux/generic/patches-2.6.36/180-netfilter_depends.patch +++ b/target/linux/generic/patches-2.6.36/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 -@@ -557,7 +556,6 @@ config NETFILTER_XT_TARGET_SECMARK +@@ -569,7 +568,6 @@ config NETFILTER_XT_TARGET_SECMARK config NETFILTER_XT_TARGET_TCPMSS tristate '"TCPMSS" target support' diff --git a/target/linux/generic/patches-2.6.36/980-vm_exports.patch b/target/linux/generic/patches-2.6.36/980-vm_exports.patch index 8cd8b16c53..d748b9b3f0 100644 --- a/target/linux/generic/patches-2.6.36/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.36/980-vm_exports.patch @@ -76,7 +76,7 @@ * macro override instead of weak attribute alias, to workaround --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -4446,6 +4446,7 @@ int can_nice(const struct task_struct *p +@@ -4439,6 +4439,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || capable(CAP_SYS_NICE)); } @@ -104,7 +104,7 @@ * We enter with non-exclusive mmap_sem (to exclude vma changes, --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -1177,6 +1177,7 @@ void unmap_kernel_range(unsigned long ad +@@ -1186,6 +1186,7 @@ void unmap_kernel_range(unsigned long ad vunmap_page_range(addr, end); flush_tlb_kernel_range(addr, end); } @@ -112,7 +112,7 @@ int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages) { -@@ -1292,6 +1293,7 @@ struct vm_struct *get_vm_area(unsigned l +@@ -1301,6 +1302,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)); } |