From 1ae1fb6b50a8cb8f036a075f0978c447dcdd4f1c 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24136 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'target/linux/generic/patches-2.6.32') 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)); } -- cgit v1.2.3