diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-02-19 12:44:23 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-02-19 12:44:23 +0000 |
| commit | d3c2b87213358a80a9d25f45fe1ba81d409dd2d8 (patch) | |
| tree | d97f377bc242702c94eb55323c6aacbcc02e261f /target/linux/generic | |
| parent | 31709b2c76c851f343f258e08c686b50aaa31be1 (diff) | |
| download | upstream-d3c2b87213358a80a9d25f45fe1ba81d409dd2d8.tar.gz upstream-d3c2b87213358a80a9d25f45fe1ba81d409dd2d8.tar.bz2 upstream-d3c2b87213358a80a9d25f45fe1ba81d409dd2d8.zip | |
update to 2.6.32.29
SVN-Revision: 25583
Diffstat (limited to 'target/linux/generic')
5 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch b/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch index dba3b32d80..9880ff0141 100644 --- a/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch +++ b/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch @@ -55,7 +55,7 @@ vesper MACH_VESPER VESPER 2256 str9 MACH_STR9 STR9 2257 omap3_wl_ff MACH_OMAP3_WL_FF OMAP3_WL_FF 2258 -@@ -2256,7 +2257,7 @@ oratisalog MACH_ORATISALOG ORATISALOG +@@ -2256,7 +2257,7 @@ oratisalog MACH_ORATISALOG ORATISALOG oratismadi MACH_ORATISMADI ORATISMADI 2269 oratisot16 MACH_ORATISOT16 ORATISOT16 2270 oratisdesk MACH_ORATISDESK ORATISDESK 2271 @@ -100,7 +100,7 @@ htc_excalibur_s620 MACH_HTC_EXCALIBUR_S620 HTC_EXCALIBUR_S620 2391 htc_opal MACH_HTC_OPAL HTC_OPAL 2392 touchbook MACH_TOUCHBOOK TOUCHBOOK 2393 -@@ -2445,7 +2446,7 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1 +@@ -2445,7 +2446,7 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1 siogentoo2 MACH_SIOGENTOO2 SIOGENTOO2 2459 sm3k MACH_SM3K SM3K 2460 acer_tempo_f900 MACH_ACER_TEMPO_F900 ACER_TEMPO_F900 2461 diff --git a/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch b/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch index 8a6cf3e821..3b46e25662 100644 --- a/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch +++ b/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch @@ -958,7 +958,7 @@ dev_queue_xmit_nit(skb, dev); if (netif_needs_gso(dev, skb)) { -@@ -1789,8 +1796,7 @@ u16 skb_tx_hash(const struct net_device +@@ -1797,8 +1804,7 @@ u16 skb_tx_hash(const struct net_device } EXPORT_SYMBOL(skb_tx_hash); @@ -968,7 +968,7 @@ { const struct net_device_ops *ops = dev->netdev_ops; u16 queue_index = 0; -@@ -1803,6 +1809,7 @@ static struct netdev_queue *dev_pick_tx( +@@ -1811,6 +1817,7 @@ static struct netdev_queue *dev_pick_tx( skb_set_queue_mapping(skb, queue_index); return netdev_get_tx_queue(dev, queue_index); } diff --git a/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch b/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch index cd4d0f7756..b9091c7b23 100644 --- a/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch +++ b/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch @@ -81,7 +81,7 @@ #include <asm/uaccess.h> -@@ -1405,3 +1406,121 @@ bool printk_timed_ratelimit(unsigned lon +@@ -1407,3 +1408,121 @@ bool printk_timed_ratelimit(unsigned lon } EXPORT_SYMBOL(printk_timed_ratelimit); #endif diff --git a/target/linux/generic/patches-2.6.32/931-crashlog.patch b/target/linux/generic/patches-2.6.32/931-crashlog.patch index 0c06700aef..c07ae17635 100644 --- a/target/linux/generic/patches-2.6.32/931-crashlog.patch +++ b/target/linux/generic/patches-2.6.32/931-crashlog.patch @@ -15,7 +15,7 @@ +#endif --- a/init/Kconfig +++ b/init/Kconfig -@@ -710,6 +710,9 @@ config NET_NS +@@ -688,6 +688,9 @@ config NET_NS Allow user space to create what appear to be multiple instances of the network stack. diff --git a/target/linux/generic/patches-2.6.32/980-vm_exports.patch b/target/linux/generic/patches-2.6.32/980-vm_exports.patch index d0d98b2e40..0dfa07f915 100644 --- a/target/linux/generic/patches-2.6.32/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.32/980-vm_exports.patch @@ -40,7 +40,7 @@ { --- a/kernel/exit.c +++ b/kernel/exit.c -@@ -507,6 +507,7 @@ struct files_struct *get_files_struct(st +@@ -514,6 +514,7 @@ struct files_struct *get_files_struct(st return files; } @@ -48,7 +48,7 @@ void put_files_struct(struct files_struct *files) { -@@ -526,6 +527,7 @@ void put_files_struct(struct files_struc +@@ -533,6 +534,7 @@ void put_files_struct(struct files_struc free_fdtable(fdt); } } @@ -68,7 +68,7 @@ * macro override instead of weak attribute alias, to workaround --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -6223,6 +6223,7 @@ int can_nice(const struct task_struct *p +@@ -6362,6 +6362,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || capable(CAP_SYS_NICE)); } |