From 92f9b431762adc0429fc61d1b79453ed0eb611b1 Mon Sep 17 00:00:00 2001 From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> Date: Wed, 6 Jan 2010 15:23:57 +0000 Subject: kernel: use generic thread_info allocator on MIPS * Fixes kernel panic if SLUB_DEBUG is enabled. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19053 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../022-mips_use_generic_thread_info_allocator.patch | 18 ++++++++++++++++++ .../022-mips_use_generic_thread_info_allocator.patch | 18 ++++++++++++++++++ .../022-mips_use_generic_thread_info_allocator.patch | 18 ++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 target/linux/generic-2.6/patches-2.6.30/022-mips_use_generic_thread_info_allocator.patch create mode 100644 target/linux/generic-2.6/patches-2.6.31/022-mips_use_generic_thread_info_allocator.patch create mode 100644 target/linux/generic-2.6/patches-2.6.32/022-mips_use_generic_thread_info_allocator.patch diff --git a/target/linux/generic-2.6/patches-2.6.30/022-mips_use_generic_thread_info_allocator.patch b/target/linux/generic-2.6/patches-2.6.30/022-mips_use_generic_thread_info_allocator.patch new file mode 100644 index 000000000..80c34046a --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.30/022-mips_use_generic_thread_info_allocator.patch @@ -0,0 +1,18 @@ +--- a/arch/mips/include/asm/thread_info.h ++++ b/arch/mips/include/asm/thread_info.h +@@ -85,6 +85,7 @@ register struct thread_info *__current_t + #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER) + #define THREAD_MASK (THREAD_SIZE - 1UL) + ++#if 0 + #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR + + #ifdef CONFIG_DEBUG_STACK_USAGE +@@ -101,6 +102,7 @@ register struct thread_info *__current_t + #endif + + #define free_thread_info(info) kfree(info) ++#endif + + #endif /* !__ASSEMBLY__ */ + diff --git a/target/linux/generic-2.6/patches-2.6.31/022-mips_use_generic_thread_info_allocator.patch b/target/linux/generic-2.6/patches-2.6.31/022-mips_use_generic_thread_info_allocator.patch new file mode 100644 index 000000000..737e51bd2 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.31/022-mips_use_generic_thread_info_allocator.patch @@ -0,0 +1,18 @@ +--- a/arch/mips/include/asm/thread_info.h ++++ b/arch/mips/include/asm/thread_info.h +@@ -83,6 +83,7 @@ register struct thread_info *__current_t + #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER) + #define THREAD_MASK (THREAD_SIZE - 1UL) + ++#if 0 + #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR + + #ifdef CONFIG_DEBUG_STACK_USAGE +@@ -99,6 +100,7 @@ register struct thread_info *__current_t + #endif + + #define free_thread_info(info) kfree(info) ++#endif + + #endif /* !__ASSEMBLY__ */ + diff --git a/target/linux/generic-2.6/patches-2.6.32/022-mips_use_generic_thread_info_allocator.patch b/target/linux/generic-2.6/patches-2.6.32/022-mips_use_generic_thread_info_allocator.patch new file mode 100644 index 000000000..786afd1dc --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.32/022-mips_use_generic_thread_info_allocator.patch @@ -0,0 +1,18 @@ +--- a/arch/mips/include/asm/thread_info.h ++++ b/arch/mips/include/asm/thread_info.h +@@ -83,6 +83,7 @@ register struct thread_info *__current_t + #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER) + #define THREAD_MASK (THREAD_SIZE - 1UL) + ++#if 0 + #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR + + #ifdef CONFIG_DEBUG_STACK_USAGE +@@ -92,6 +93,7 @@ register struct thread_info *__current_t + #endif + + #define free_thread_info(info) kfree(info) ++#endif + + #endif /* !__ASSEMBLY__ */ + -- cgit v1.2.3