From ead8ab8403bfbc0fa588c6590e85c18141fa74a2 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Wed, 24 Nov 2010 18:50:11 +0000 Subject: update to the latest stable kernels SVN-Revision: 24136 --- target/linux/generic/patches-2.6.32/040-use_ext4_for_ext23.patch | 6 +++--- .../generic/patches-2.6.32/041-ext4_do_not_override_ext23.patch | 4 ++-- .../generic/patches-2.6.32/042-ext4_add_ext23_module_aliases.patch | 4 ++-- target/linux/generic/patches-2.6.32/980-vm_exports.patch | 6 +++--- .../generic/patches-2.6.35/030-pci_disable_common_quirks.patch | 4 ++-- target/linux/generic/patches-2.6.35/180-netfilter_depends.patch | 2 +- target/linux/generic/patches-2.6.35/975-ssb_update.patch | 2 +- target/linux/generic/patches-2.6.35/980-vm_exports.patch | 6 +++--- .../generic/patches-2.6.36/103-netfilter_layer7_2.6.36_fix.patch | 4 ++-- target/linux/generic/patches-2.6.36/180-netfilter_depends.patch | 2 +- target/linux/generic/patches-2.6.36/980-vm_exports.patch | 6 +++--- 11 files changed, 23 insertions(+), 23 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/patches-2.6.32/040-use_ext4_for_ext23.patch b/target/linux/generic/patches-2.6.32/040-use_ext4_for_ext23.patch index d5824f1bdb..db2fc3849f 100644 --- a/target/linux/generic/patches-2.6.32/040-use_ext4_for_ext23.patch +++ b/target/linux/generic/patches-2.6.32/040-use_ext4_for_ext23.patch @@ -37,7 +37,7 @@ Signed-off-by: "Theodore Ts'o" depends on EXT4_FS --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -3989,6 +3989,58 @@ static int ext4_get_sb(struct file_syste +@@ -3994,6 +3994,58 @@ static int ext4_get_sb(struct file_syste return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt); } @@ -96,7 +96,7 @@ Signed-off-by: "Theodore Ts'o" static struct file_system_type ext4_fs_type = { .owner = THIS_MODULE, .name = "ext4", -@@ -4018,11 +4070,15 @@ static int __init init_ext4_fs(void) +@@ -4024,11 +4076,15 @@ static int __init init_ext4_fs(void) err = init_inodecache(); if (err) goto out1; @@ -112,7 +112,7 @@ Signed-off-by: "Theodore Ts'o" destroy_inodecache(); out1: exit_ext4_xattr(); -@@ -4038,6 +4094,8 @@ out4: +@@ -4044,6 +4100,8 @@ out4: static void __exit exit_ext4_fs(void) { diff --git a/target/linux/generic/patches-2.6.32/041-ext4_do_not_override_ext23.patch b/target/linux/generic/patches-2.6.32/041-ext4_do_not_override_ext23.patch index 19b5626eef..f45973e7c7 100644 --- a/target/linux/generic/patches-2.6.32/041-ext4_do_not_override_ext23.patch +++ b/target/linux/generic/patches-2.6.32/041-ext4_do_not_override_ext23.patch @@ -26,7 +26,7 @@ Signed-off-by: "Theodore Ts'o" Allow the ext4 file system driver code to be used for ext2 or --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -3989,7 +3989,7 @@ static int ext4_get_sb(struct file_syste +@@ -3994,7 +3994,7 @@ static int ext4_get_sb(struct file_syste return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt); } @@ -35,7 +35,7 @@ Signed-off-by: "Theodore Ts'o" static struct file_system_type ext2_fs_type = { .owner = THIS_MODULE, .name = "ext2", -@@ -4015,7 +4015,7 @@ static inline void register_as_ext2(void +@@ -4020,7 +4020,7 @@ static inline void register_as_ext2(void static inline void unregister_as_ext2(void) { } #endif diff --git a/target/linux/generic/patches-2.6.32/042-ext4_add_ext23_module_aliases.patch b/target/linux/generic/patches-2.6.32/042-ext4_add_ext23_module_aliases.patch index 7ac97b5010..2bf863b2d4 100644 --- a/target/linux/generic/patches-2.6.32/042-ext4_add_ext23_module_aliases.patch +++ b/target/linux/generic/patches-2.6.32/042-ext4_add_ext23_module_aliases.patch @@ -15,7 +15,7 @@ Signed-off-by: "Theodore Ts'o" --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -4010,6 +4010,7 @@ static inline void unregister_as_ext2(vo +@@ -4015,6 +4015,7 @@ static inline void unregister_as_ext2(vo { unregister_filesystem(&ext2_fs_type); } @@ -23,7 +23,7 @@ Signed-off-by: "Theodore Ts'o" #else static inline void register_as_ext2(void) { } static inline void unregister_as_ext2(void) { } -@@ -4036,6 +4037,7 @@ static inline void unregister_as_ext3(vo +@@ -4041,6 +4042,7 @@ static inline void unregister_as_ext3(vo { unregister_filesystem(&ext3_fs_type); } 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 5d55fa9642..d0d98b2e40 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 @@ -68,7 +68,7 @@ * macro override instead of weak attribute alias, to workaround --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -6224,6 +6224,7 @@ int can_nice(const struct task_struct *p +@@ -6223,6 +6223,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || capable(CAP_SYS_NICE)); } @@ -96,7 +96,7 @@ * We enter with non-exclusive mmap_sem (to exclude vma changes, --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -1172,6 +1172,7 @@ void unmap_kernel_range(unsigned long ad +@@ -1181,6 +1181,7 @@ void unmap_kernel_range(unsigned long ad vunmap_page_range(addr, end); flush_tlb_kernel_range(addr, end); } @@ -104,7 +104,7 @@ int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages) { -@@ -1287,6 +1288,7 @@ struct vm_struct *get_vm_area(unsigned l +@@ -1296,6 +1297,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)); } diff --git a/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch index 0f4789a704..5fc49494a7 100644 --- a/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch +++ b/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch @@ -23,7 +23,7 @@ /* The Mellanox Tavor device gives false positive parity errors * Mark this device with a broken_parity_status, to allow * PCI scanning code to "skip" this now blacklisted device. -@@ -1904,7 +1905,9 @@ static void __devinit fixup_rev1_53c810( +@@ -1924,7 +1925,9 @@ static void __devinit fixup_rev1_53c810( } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); @@ -33,7 +33,7 @@ /* Enable 1k I/O space granularity on the Intel P64H2 */ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) { -@@ -2560,6 +2563,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -2580,6 +2583,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov); #endif /* CONFIG_PCI_IOV */ diff --git a/target/linux/generic/patches-2.6.35/180-netfilter_depends.patch b/target/linux/generic/patches-2.6.35/180-netfilter_depends.patch index 5532e2b350..977f892d46 100644 --- a/target/linux/generic/patches-2.6.35/180-netfilter_depends.patch +++ b/target/linux/generic/patches-2.6.35/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 -@@ -550,7 +549,6 @@ config NETFILTER_XT_TARGET_SECMARK +@@ -562,7 +561,6 @@ config NETFILTER_XT_TARGET_SECMARK config NETFILTER_XT_TARGET_TCPMSS tristate '"TCPMSS" target support' diff --git a/target/linux/generic/patches-2.6.35/975-ssb_update.patch b/target/linux/generic/patches-2.6.35/975-ssb_update.patch index 6cf41cc6a0..35d0515160 100644 --- a/target/linux/generic/patches-2.6.35/975-ssb_update.patch +++ b/target/linux/generic/patches-2.6.35/975-ssb_update.patch @@ -298,7 +298,7 @@ tx_ring_dma + size > DMA_BIT_MASK(30)) { kfree(tx_ring); goto out_err; -@@ -2176,12 +2169,14 @@ static int __devinit b44_init_one(struct +@@ -2174,12 +2167,14 @@ static int __devinit b44_init_one(struct "Failed to powerup the bus\n"); goto err_out_free_dev; } diff --git a/target/linux/generic/patches-2.6.35/980-vm_exports.patch b/target/linux/generic/patches-2.6.35/980-vm_exports.patch index 8a021e24c7..5ca94b25a2 100644 --- a/target/linux/generic/patches-2.6.35/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.35/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 -@@ -4269,6 +4269,7 @@ int can_nice(const struct task_struct *p +@@ -4262,6 +4262,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 -@@ -1173,6 +1173,7 @@ void unmap_kernel_range(unsigned long ad +@@ -1182,6 +1182,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) { -@@ -1288,6 +1289,7 @@ struct vm_struct *get_vm_area(unsigned l +@@ -1297,6 +1298,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)); } 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)); } -- cgit v1.2.3