The following commit has been merged in the linux branch: commit 962a9dd47e7d92a9b29e7114c108bcff3ad0eb05 Author: Ralf Baechle ralf@linux-mips.org Date: Wed Oct 7 01:59:20 2009 +0200

MIPS: Cleanup CONFIG_DEBUG_STACK_USAGE version of alloc_thread_info.

Signed-off-by: Ralf Baechle ralf@linux-mips.org

diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h index 01cc163..845da21 100644 --- a/arch/mips/include/asm/thread_info.h +++ b/arch/mips/include/asm/thread_info.h @@ -86,14 +86,7 @@ register struct thread_info *__current_thread_info __asm__("$28"); #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR

#ifdef CONFIG_DEBUG_STACK_USAGE -#define alloc_thread_info(tsk) \ -({ \ - struct thread_info *ret; \ - \ - ret = kzalloc(THREAD_SIZE, GFP_KERNEL); \ - \ - ret; \ -}) +#define alloc_thread_info(tsk) kzalloc(THREAD_SIZE, GFP_KERNEL) #else #define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL) #endif