From 682ddfda05416bdb57f4a3700dd29abab5d23d10 Mon Sep 17 00:00:00 2001 From: WANG Cong Date: Wed, 3 Aug 2011 16:21:12 -0700 Subject: [PATCH] --- yaml --- r: 262310 b: refs/heads/master c: d4969213f9e75ec1bfa6ea65c279c64cab7d1bd6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/cris/include/asm/thread_info.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9db8f623e944..79a8b8207805 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1560ffe62a9d53a51faeec7417becfba4f2a0d18 +refs/heads/master: d4969213f9e75ec1bfa6ea65c279c64cab7d1bd6 diff --git a/trunk/arch/cris/include/asm/thread_info.h b/trunk/arch/cris/include/asm/thread_info.h index 29b74a105830..332f19c54557 100644 --- a/trunk/arch/cris/include/asm/thread_info.h +++ b/trunk/arch/cris/include/asm/thread_info.h @@ -11,8 +11,6 @@ #ifdef __KERNEL__ -#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR - #ifndef __ASSEMBLY__ #include #include @@ -67,8 +65,10 @@ struct thread_info { #define init_thread_info (init_thread_union.thread_info) +#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR /* thread information allocation */ -#define alloc_thread_info(tsk, node) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1)) +#define alloc_thread_info_node(tsk, node) \ + ((struct thread_info *) __get_free_pages(GFP_KERNEL, 1)) #define free_thread_info(ti) free_pages((unsigned long) (ti), 1) #endif /* !__ASSEMBLY__ */