Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96c95117 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

powerpc: Use common threadinfo allocator 



The core now has a threadinfo allocator which uses a kmemcache when
THREAD_SIZE < PAGE_SIZE.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Link: http://lkml.kernel.org/r/20120505150142.059161130@linutronix.de
parent 3194f61d

arch/powerpc/include/asm/thread_info.h

+0 −13
Original line number Original line Diff line number Diff line
@@ -62,21 +62,8 @@ struct thread_info { 
#define init_thread_info	(init_thread_union.thread_info)

#define init_thread_info	(init_thread_union.thread_info)

#define init_stack		(init_thread_union.stack)

#define init_stack		(init_thread_union.stack)





/* thread information allocation */



#if THREAD_SHIFT >= PAGE_SHIFT



#define THREAD_SIZE_ORDER	(THREAD_SHIFT - PAGE_SHIFT)

#define THREAD_SIZE_ORDER	(THREAD_SHIFT - PAGE_SHIFT)





#else /* THREAD_SHIFT < PAGE_SHIFT */



#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR



extern struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node);

extern void free_thread_info(struct thread_info *ti);



#endif /* THREAD_SHIFT < PAGE_SHIFT */



/* how to get the thread information struct from C */

/* how to get the thread information struct from C */

static inline struct thread_info *current_thread_info(void)

static inline struct thread_info *current_thread_info(void)

{

{

arch/powerpc/kernel/process.c

+0 −31
Original line number Original line Diff line number Diff line
@@ -1252,37 +1252,6 @@ void __ppc64_runlatch_off(void) 
}

}

#endif /* CONFIG_PPC64 */

#endif /* CONFIG_PPC64 */





#if THREAD_SHIFT < PAGE_SHIFT



static struct kmem_cache *thread_info_cache;



struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node)

{

	struct thread_info *ti;



	ti = kmem_cache_alloc_node(thread_info_cache, GFP_KERNEL, node);

	if (unlikely(ti == NULL))

		return NULL;

#ifdef CONFIG_DEBUG_STACK_USAGE

	memset(ti, 0, THREAD_SIZE);

#endif

	return ti;

}



void free_thread_info(struct thread_info *ti)

{

	kmem_cache_free(thread_info_cache, ti);

}



void thread_info_cache_init(void)

{

	thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,

					      THREAD_SIZE, 0, NULL);

	BUG_ON(thread_info_cache == NULL);

}



#endif /* THREAD_SHIFT < PAGE_SHIFT */



unsigned long arch_align_stack(unsigned long sp)

unsigned long arch_align_stack(unsigned long sp)

{

{

	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)

	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)