From e8f12d4a7e556049527de548de98cedbe35032d9 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 5 May 2012 15:05:46 +0000 Subject: [PATCH] --- yaml --- r: 302847 b: refs/heads/master c: c4e26890ff4cb4e85969b1e8565af4b046ce03b8 h: refs/heads/master i: 302845: 291ebc2cfd86cfc21629c1541dec052ad0cf1fd4 302843: 88b71043ef718e019409584ee95cd06f09f85d4c 302839: 3a9ea60f4faccba39927ba9857eb6d2321fad644 302831: 7a10e3e1a24f98c48407bd99581c7599e9e7377e 302815: 01379f673af172ceb8c1e5da67623ba39230d06b 302783: 04e906af49ecac75274f882c9415a2b4870ed477 302719: 04fb773c861b88c69f43c8b774728f1a19cdfed0 302591: db5811eafef9bd2b38c4b7e71b1ad6ba4d3d3404 v: v3 --- [refs] | 2 +- trunk/arch/score/include/asm/thread_info.h | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 12a7e73cc323..0a83c16e694a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df9a7b9b5d1a5ef8cd3474d0cea2c6428542e288 +refs/heads/master: c4e26890ff4cb4e85969b1e8565af4b046ce03b8 diff --git a/trunk/arch/score/include/asm/thread_info.h b/trunk/arch/score/include/asm/thread_info.h index 2205c62284db..a18006e97f1c 100644 --- a/trunk/arch/score/include/asm/thread_info.h +++ b/trunk/arch/score/include/asm/thread_info.h @@ -11,10 +11,9 @@ #include /* thread information allocation */ -#define THREAD_SIZE_ORDER (1) -#define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER) -#define THREAD_MASK (THREAD_SIZE - _AC(1,UL)) -#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR +#define THREAD_SIZE_ORDER (1) +#define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER) +#define THREAD_MASK (THREAD_SIZE - _AC(1,UL)) #ifndef __ASSEMBLY__ @@ -71,9 +70,6 @@ struct thread_info { register struct thread_info *__current_thread_info __asm__("r28"); #define current_thread_info() __current_thread_info -#define alloc_thread_info_node(tsk, node) kmalloc_node(THREAD_SIZE, GFP_KERNEL, node) -#define free_thread_info(info) kfree(info) - #endif /* !__ASSEMBLY__ */ #define PREEMPT_ACTIVE 0x10000000