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

Commit b6a84016 authored by Eric Dumazet's avatar Eric Dumazet Committed by Linus Torvalds
Browse files

mm: NUMA aware alloc_thread_info_node() 



Add a node parameter to alloc_thread_info(), and change its name to
alloc_thread_info_node()

This change is needed to allow NUMA aware kthread_create_on_cpu()

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Reviewed-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Cc: Tejun Heo <tj@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: David Howells <dhowells@redhat.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 504f52b5

arch/cris/include/asm/thread_info.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ struct thread_info { 
#define init_thread_info	(init_thread_union.thread_info)



/* thread information allocation */

#define alloc_thread_info(tsk) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1))

#define alloc_thread_info(tsk, node) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1))

#define free_thread_info(ti) free_pages((unsigned long) (ti), 1)



#endif /* !__ASSEMBLY__ */

arch/frv/include/asm/thread_info.h

+4 −9
Original line number Diff line number Diff line
@@ -84,16 +84,11 @@ register struct thread_info *__current_thread_info asm("gr15"); 


/* thread information allocation */

#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_node(tsk, node)			\

		kzalloc_node(THREAD_SIZE, GFP_KERNEL, node)

#else

#define alloc_thread_info(tsk)	kmalloc(THREAD_SIZE, GFP_KERNEL)

#define alloc_thread_info_node(tsk)				\

		kmalloc_node(THREAD_SIZE, GFP_KERNEL, node)

#endif



#define free_thread_info(info)	kfree(info)

arch/ia64/include/asm/thread_info.h

+3 −2
Original line number Diff line number Diff line
@@ -59,11 +59,12 @@ struct thread_info { 
#ifndef ASM_OFFSETS_C

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

#define current_thread_info()	((struct thread_info *) ((char *) current + IA64_TASK_SIZE))

#define alloc_thread_info(tsk)	((struct thread_info *) ((char *) (tsk) + IA64_TASK_SIZE))

#define alloc_thread_info_node(tsk, node)	\

		((struct thread_info *) ((char *) (tsk) + IA64_TASK_SIZE))

#define task_thread_info(tsk)	((struct thread_info *) ((char *) (tsk) + IA64_TASK_SIZE))

#else

#define current_thread_info()	((struct thread_info *) 0)

#define alloc_thread_info(tsk)	((struct thread_info *) 0)

#define alloc_thread_info_node(tsk, node)	((struct thread_info *) 0)

#define task_thread_info(tsk)	((struct thread_info *) 0)

#endif

#define free_thread_info(ti)	/* nothing */

arch/m32r/include/asm/thread_info.h

+4 −9
Original line number Diff line number Diff line
@@ -96,16 +96,11 @@ static inline struct thread_info *current_thread_info(void) 


/* thread information allocation */

#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_node(tsk, node)			\

		kzalloc_node(THREAD_SIZE, GFP_KERNEL, node)

#else

#define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL)

#define alloc_thread_info_node(tsk, node)			\

		kmalloc_node(THREAD_SIZE, GFP_KERNEL, node)

#endif



#define free_thread_info(info) kfree(info)

arch/mips/include/asm/thread_info.h

+4 −2
Original line number Diff line number Diff line
@@ -88,9 +88,11 @@ 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) kzalloc(THREAD_SIZE, GFP_KERNEL)

#define alloc_thread_info_node(tsk, node) \

		kzalloc_node(THREAD_SIZE, GFP_KERNEL, node)

#else

#define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL)

#define alloc_thread_info_node(tsk, node) \

		kmalloc_node(THREAD_SIZE, GFP_KERNEL, node)

#endif



#define free_thread_info(info) kfree(info)