From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Jan 2018 17:08:34 +0000 (-0800)
Subject: Merge tag 'init_task-20180117' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe... 
X-Git-Tag: v4.16-rc1~198
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49f9c3552ccc30f4f98c45d94d7f9b335596913f;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'init_task-20180117' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/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
---

49f9c3552ccc30f4f98c45d94d7f9b335596913f
diff --cc include/linux/irqflags.h
index 1b3996ff3f16d,2ec81dc1487e9..9700f00bbc043
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@@ -39,8 -42,8 +39,7 @@@ do {						
  # define lockdep_softirq_exit()			\
  do {						\
  	current->softirq_context--;		\
 -	crossrelease_hist_end(XHLOCK_SOFT);	\
  } while (0)
- # define INIT_TRACE_IRQFLAGS	.softirqs_enabled = 1,
  #else
  # define trace_hardirqs_on()		do { } while (0)
  # define trace_hardirqs_off()		do { } while (0)