Commit 6adc19fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild 

Pull more Kbuild updates from Masahiro Yamada:

 - fix build rules in binderfs sample

 - fix build errors when Kbuild recurses to the top Makefile

 - covert '---help---' in Kconfig to 'help'

* tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  treewide: replace '---help---' in Kconfig files with 'help'
  kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
  samples: binderfs: really compile this sample and fix build issues
parents 3df83e16 a7f7f624

Makefile

+5 −19
Original line number Diff line number Diff line
@@ -458,27 +458,13 @@ PYTHON = python 
PYTHON3		= python3

CHECK		= sparse

BASH		= bash

GZIP		= gzip

BZIP2		= bzip2

LZOP		= lzop

KGZIP		= gzip

KBZIP2		= bzip2

KLZOP		= lzop

LZMA		= lzma

LZ4		= lz4c

XZ		= xz



# GZIP, BZIP2, LZOP env vars are used by the tools. Support them as the command

# line interface, but use _GZIP, _BZIP2, _LZOP internally.

_GZIP          := $(GZIP)

_BZIP2         := $(BZIP2)

_LZOP          := $(LZOP)



# Reset GZIP, BZIP2, LZOP in this Makefile

override GZIP=

override BZIP2=

override LZOP=



# Reset GZIP, BZIP2, LZOP in recursive invocations

MAKEOVERRIDES += GZIP= BZIP2= LZOP=



CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

		  -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)

NOSTDINC_FLAGS :=
@@ -526,7 +512,7 @@ CLANG_FLAGS := 
export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC

export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE READELF PAHOLE LEX YACC AWK INSTALLKERNEL

export PERL PYTHON PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX

export _GZIP _BZIP2 _LZOP LZMA LZ4 XZ

export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ

export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE



export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS
@@ -1048,7 +1034,7 @@ export mod_strip_cmd 
mod_compress_cmd = true

ifdef CONFIG_MODULE_COMPRESS

  ifdef CONFIG_MODULE_COMPRESS_GZIP

    mod_compress_cmd = $(_GZIP) -n -f

    mod_compress_cmd = $(KGZIP) -n -f

  endif # CONFIG_MODULE_COMPRESS_GZIP

  ifdef CONFIG_MODULE_COMPRESS_XZ

    mod_compress_cmd = $(XZ) -f

arch/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ config VMAP_STACK 
	bool "Use a virtually-mapped stack"

	depends on HAVE_ARCH_VMAP_STACK

	depends on !KASAN || KASAN_VMALLOC

	---help---

	help

	  Enable this if you want the use virtually-mapped kernel stacks

	  with guard pages.  This causes kernel stack overflows to be

	  caught immediately rather than causing difficult-to-diagnose
@@ -948,7 +948,7 @@ config ARCH_USE_MEMREMAP_PROT 
config LOCK_EVENT_COUNTS

	bool "Locking event counts collection"

	depends on DEBUG_FS

	---help---

	help

	  Enable light-weight counting of various locking related events

	  in the system with minimal performance impact. This reduces

	  the chance of application behavior change because of timing

arch/alpha/Kconfig

+9 −9
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ menu "System setup" 
choice

	prompt "Alpha system type"

	default ALPHA_GENERIC

	---help---

	help

	  This is the system type of your hardware.  A "generic" kernel will

	  run on any supported Alpha system. However, if you configure a

	  kernel for your specific system, it will be faster and smaller.
@@ -480,7 +480,7 @@ config VGA_HOSE 
config ALPHA_QEMU

	bool "Run under QEMU emulation"

	depends on !ALPHA_GENERIC

	---help---

	help

	  Assume the presence of special features supported by QEMU PALcode

	  that reduce the overhead of system emulation.
@@ -495,7 +495,7 @@ config ALPHA_SRM 
	bool "Use SRM as bootloader" if ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_NAUTILUS || ALPHA_NONAME

	depends on TTY

	default y if ALPHA_JENSEN || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_DP264 || ALPHA_RAWHIDE || ALPHA_EIGER || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_SHARK || ALPHA_MARVEL

	---help---

	help

	  There are two different types of booting firmware on Alphas: SRM,

	  which is command line driven, and ARC, which uses menus and arrow

	  keys. Details about the Linux/Alpha booting process are contained in
@@ -521,7 +521,7 @@ config ARCH_MAY_HAVE_PC_FDC 
config SMP

	bool "Symmetric multi-processing support"

	depends on ALPHA_SABLE || ALPHA_LYNX || ALPHA_RAWHIDE || ALPHA_DP264 || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_GENERIC || ALPHA_SHARK || ALPHA_MARVEL

	---help---

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, say N. If you have a system with more

	  than one CPU, say Y.
@@ -569,7 +569,7 @@ config ALPHA_WTINT 
	default n if ALPHA_EV5 || ALPHA_EV56 || (ALPHA_EV4 && !ALPHA_LCA)

	default n if !ALPHA_SRM && !ALPHA_GENERIC

	default y if SMP

	---help---

	help

	  The Wait for Interrupt (WTINT) PALcall attempts to place the CPU

	  to sleep until the next interrupt.  This may reduce the power

	  consumed, and the heat produced by the computer.  However, it has
@@ -595,7 +595,7 @@ config NODES_SHIFT 
# LARGE_VMALLOC is racy, if you *really* need it then fix it first

config ALPHA_LARGE_VMALLOC

	bool

	---help---

	help

	  Process creation and other aspects of virtual memory management can

	  be streamlined if we restrict the kernel to one PGD for all vmalloc

	  allocations.  This equates to about 8GB.
@@ -614,7 +614,7 @@ config VERBOSE_MCHECK_ON 
	int "Verbose Printing Mode (0=off, 1=on, 2=all)"

	depends on VERBOSE_MCHECK

	default 1

	---help---

	help

	  This option allows the default printing mode to be set, and then

	  possibly overridden by a boot command argument.
@@ -633,7 +633,7 @@ choice 
	default HZ_128 if ALPHA_QEMU

	default HZ_1200 if ALPHA_RAWHIDE

	default HZ_1024

	---help---

	help

	  The frequency at which timer interrupts occur.  A high frequency

	  minimizes latency, whereas a low frequency minimizes overhead of

	  process accounting.  The later effect is especially significant
@@ -668,7 +668,7 @@ config HZ 
config SRM_ENV

	tristate "SRM environment through procfs"

	depends on PROC_FS

	---help---

	help

	  If you enable this option, a subdirectory inside /proc called

	  /proc/srm_environment will give you access to the all important

	  SRM environment variables (those which have a name) and also

arch/alpha/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ config ALPHA_LEGACY_START_ADDRESS 
	bool "Legacy kernel start address"

	depends on ALPHA_GENERIC

	default n

	---help---

	help

	  The 2.4 kernel changed the kernel start address from 0x310000

	  to 0x810000 to make room for the Wildfire's larger SRM console.

	  Recent consoles on Titan and Marvel machines also require the

arch/arc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ config NODES_SHIFT 
	default "0" if !DISCONTIGMEM

	default "1" if DISCONTIGMEM

	depends on NEED_MULTIPLE_NODES

	---help---

	help

	  Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory

	  zones.