From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Sep 2019 18:07:02 +0000 (-0700)
Subject: Merge tag 'for-linus-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
X-Git-Tag: v5.4-rc1~86
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/9dca3432ee063b70a4cfb3f0857d0aeef7b84fa8?hp=-c

Merge tag 'for-linus-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML updates from Richard Weinberger:

 - virtio support

 - fixes for our new time travel mode

 - various improvements to make lockdep and kasan work better

 - SPDX header updates

* tag 'for-linus-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (25 commits)
  um: irq: Fix LAST_IRQ usage in init_IRQ()
  um: Add SPDX headers for files in arch/um/include
  um: Add SPDX headers for files in arch/um/os-Linux
  um: Add SPDX headers to files in arch/um/kernel/
  um: Add SPDX headers for files in arch/um/drivers
  um: virtio: Implement VHOST_USER_PROTOCOL_F_REPLY_ACK
  um: virtio: Implement VHOST_USER_PROTOCOL_F_SLAVE_REQ
  um: drivers: Add virtio vhost-user driver
  um: Use real DMA barriers
  um: Don't use generic barrier.h
  um: time-travel: Restrict time update in IRQ handler
  um: time-travel: Fix periodic timers
  um: Enable CONFIG_CONSTRUCTORS
  um: Place (soft)irq text with macros
  um: Fix VDSO compiler warning
  um: Implement TRACE_IRQFLAGS_SUPPORT
  um: Remove misleading #define ARCh_IRQ_ENABLED
  um: Avoid using uninitialized regs
  um: Remove sig_info[SIGALRM]
  um: Error handling fixes in vector drivers
  ...
---

9dca3432ee063b70a4cfb3f0857d0aeef7b84fa8
diff --combined init/Kconfig
index 7020238fd263,81293d78a6ad..058ba4e74250
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -30,12 -30,6 +30,12 @@@ config CC_CAN_LIN
  config CC_HAS_ASM_GOTO
  	def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC))
  
 +config TOOLS_SUPPORT_RELR
 +	def_bool $(success,env "CC=$(CC)" "LD=$(LD)" "NM=$(NM)" "OBJCOPY=$(OBJCOPY)" $(srctree)/scripts/tools-support-relr.sh)
 +
 +config CC_HAS_ASM_INLINE
 +	def_bool $(success,echo 'void foo(void) { asm inline (""); }' | $(CC) -x c - -c -o /dev/null)
 +
  config CC_HAS_WARN_MAYBE_UNINITIALIZED
  	def_bool $(cc-option,-Wmaybe-uninitialized)
  	help
@@@ -54,7 -48,6 +54,6 @@@ config CC_DISABLE_WARN_MAYBE_UNINITIALI
  
  config CONSTRUCTORS
  	bool
- 	depends on !UML
  
  config IRQ_WORK
  	bool
@@@ -934,28 -927,6 +933,28 @@@ config RT_GROUP_SCHE
  
  endif #CGROUP_SCHED
  
 +config UCLAMP_TASK_GROUP
 +	bool "Utilization clamping per group of tasks"
 +	depends on CGROUP_SCHED
 +	depends on UCLAMP_TASK
 +	default n
 +	help
 +	  This feature enables the scheduler to track the clamped utilization
 +	  of each CPU based on RUNNABLE tasks currently scheduled on that CPU.
 +
 +	  When this option is enabled, the user can specify a min and max
 +	  CPU bandwidth which is allowed for each single task in a group.
 +	  The max bandwidth allows to clamp the maximum frequency a task
 +	  can use, while the min bandwidth allows to define a minimum
 +	  frequency a task will always use.
 +
 +	  When task group based utilization clamping is enabled, an eventually
 +	  specified task-specific clamp value is constrained by the cgroup
 +	  specified clamp value. Both minimum and maximum task clamping cannot
 +	  be bigger than the corresponding clamping defined at task group level.
 +
 +	  If in doubt, say N.
 +
  config CGROUP_PIDS
  	bool "PIDs controller"
  	help
@@@ -1237,26 -1208,20 +1236,26 @@@ choic
  	default CC_OPTIMIZE_FOR_PERFORMANCE
  
  config CC_OPTIMIZE_FOR_PERFORMANCE
 -	bool "Optimize for performance"
 +	bool "Optimize for performance (-O2)"
  	help
  	  This is the default optimization level for the kernel, building
  	  with the "-O2" compiler flag for best performance and most
  	  helpful compile-time warnings.
  
 -config CC_OPTIMIZE_FOR_SIZE
 -	bool "Optimize for size"
 +config CC_OPTIMIZE_FOR_PERFORMANCE_O3
 +	bool "Optimize more for performance (-O3)"
 +	depends on ARC
  	imply CC_DISABLE_WARN_MAYBE_UNINITIALIZED  # avoid false positives
  	help
 -	  Enabling this option will pass "-Os" instead of "-O2" to
 -	  your compiler resulting in a smaller kernel.
 +	  Choosing this option will pass "-O3" to your compiler to optimize
 +	  the kernel yet more for performance.
  
 -	  If unsure, say N.
 +config CC_OPTIMIZE_FOR_SIZE
 +	bool "Optimize for size (-Os)"
 +	imply CC_DISABLE_WARN_MAYBE_UNINITIALIZED  # avoid false positives
 +	help
 +	  Choosing this option will pass "-Os" to your compiler resulting
 +	  in a smaller kernel.
  
  endchoice
  
@@@ -2023,14 -1988,6 +2022,14 @@@ config MODVERSION
  	  make them incompatible with the kernel you are running.  If
  	  unsure, say N.
  
 +config ASM_MODVERSIONS
 +	bool
 +	default HAVE_ASM_MODVERSIONS && MODVERSIONS
 +	help
 +	  This enables module versioning for exported symbols also from
 +	  assembly. This can be enabled only when the target architecture
 +	  supports it.
 +
  config MODULE_REL_CRCS
  	bool
  	depends on MODVERSIONS