Commit 49f9c355 authored Jan 29, 2018 by Linus Torvalds

linux-fs

Pull init_task initializer cleanups from David Howells:
 "It doesn't seem useful to have the init_task in a header file rather
  than in a normal source file. We could consolidate init_task handling
  instead and expand out various macros.

  Here's a series of patches that consolidate init_task handling:

   (1) Make THREAD_SIZE available to vmlinux.lds for cris, hexagon and
       openrisc.

   (2) Alter the INIT_TASK_DATA linker script macro to set
       init_thread_union and init_stack rather than defining these in C.

       Insert init_task and init_thread_into into the init_stack area in
       the linker script as appropriate to the configuration, with
       different section markers so that they end up correctly ordered.

       We can then get merge ia64's init_task.c into the main one.

       We then have a bunch of single-use INIT_*() macros that seem only
       to be macros because they used to be used per-arch. We can then
       expand these in place of the user and get rid of a few lines and
       a lot of backslashes.

   (3) Expand INIT_TASK() in place.

   (4) Expand in place various small INIT_*() macros that are defined
       conditionally. Expand them and surround them by #if[n]def/#endif
       in the .c file as it takes fewer lines.

   (5) Expand INIT_SIGNALS() and INIT_SIGHAND() in place.

   (6) Expand INIT_STRUCT_PID in place.

  These macros can then be discarded"

* tag 'init_task-20180117' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  Expand INIT_STRUCT_PID and remove
  Expand the INIT_SIGNALS and INIT_SIGHAND macros and remove
  Expand various INIT_* macros and remove
  Expand INIT_TASK() in init/init_task.c and remove
  Construct init thread stack in the linker script rather than by union
  openrisc: Make THREAD_SIZE available to vmlinux.lds
  hexagon: Make THREAD_SIZE available to vmlinux.lds
  cris: Make THREAD_SIZE available to vmlinux.lds

parents d8a5b805 e1e871af

arch/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -234,8 +234,8 @@ config ARCH_HAS_FORTIFY_SOURCE
		config ARCH_HAS_SET_MEMORY
		bool

		# Select if arch init_task initializer is different to init/init_task.c
		config ARCH_INIT_TASK
		# Select if arch init_task must go in the __init_task_data section
		config ARCH_TASK_STRUCT_ON_STACK
		bool

		# Select if arch has its private alloc_task_struct() function

arch/alpha/include/asm/thread_info.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -39,9 +39,6 @@ struct thread_info {
		.preempt_count = INIT_PREEMPT_COUNT, \
		}

		#define init_thread_info (init_thread_union.thread_info)
		#define init_stack (init_thread_union.stack)

		/* How to get the thread information struct from C. */
		register struct thread_info *__current_thread_info __asm__("$8");
		#define current_thread_info() __current_thread_info

arch/arc/include/asm/thread_info.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -62,9 +62,6 @@ struct thread_info {
		.addr_limit = KERNEL_DS, \
		}

		#define init_thread_info (init_thread_union.thread_info)
		#define init_stack (init_thread_union.stack)

		static inline __attribute_const__ struct thread_info *current_thread_info(void)
		{
		register unsigned long sp asm("sp");

arch/arm/include/asm/thread_info.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -75,9 +75,6 @@ struct thread_info {
		.addr_limit = KERNEL_DS, \
		}

		#define init_thread_info (init_thread_union.thread_info)
		#define init_stack (init_thread_union.stack)

		/*
		* how to get the current stack pointer in C
		*/

arch/arm64/include/asm/thread_info.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -51,8 +51,6 @@ struct thread_info {
		.addr_limit = KERNEL_DS, \
		}

		#define init_stack (init_thread_union.stack)

		#define thread_saved_pc(tsk) \
		((unsigned long)(tsk->thread.cpu_context.pc))
		#define thread_saved_sp(tsk) \

Admin message