Merge tag 'kconfig-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

Pull Kconfig updates from Masahiro Yamada:

 - always require argument for --defconfig and remove the hard-coded
   arch/$(ARCH)/defconfig path

 - make arch/$(SRCARCH)/configs/defconfig the new default of defconfig

 - some code cleanups

* tag 'kconfig-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kconfig: remove meaningless if-conditional in conf_read()
  kconfig: Fix spelling of sym_is_changable
  unicore32: rename unicore32_defconfig to defconfig
  kconfig: make arch/*/configs/defconfig the default of KBUILD_DEFCONFIG
  kconfig: add static qualifier to expand_string()
  kconfig: require the argument of --defconfig
  kconfig: remove always false ifeq ($(KBUILD_DEFCONFIG,) conditional

diff --combined arch/arm64/Makefile
index e3d3fd0,7a45899..bb1f1db
--- 1/arch/arm64/Makefile
--- 2/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@@ -30,8 -30,6 +30,6 @@@ LDFLAGS_vmlinux       += --fix-cortex-a53-843
    endif
  endif
  
- KBUILD_DEFCONFIG := defconfig
- 
  # Check for binutils support for specific extensions
  lseinstr := $(call as-instr,.arch_extension lse,-DCONFIG_AS_LSE=1)
  
@@@ -49,26 -47,10 +47,26 @@@ $(warning Detected assembler with broke
    endif
  endif
  
 -KBUILD_CFLAGS += -mgeneral-regs-only $(lseinstr) $(brokengasinst)
 +ifeq ($(CONFIG_GENERIC_COMPAT_VDSO), y)
 +  CROSS_COMPILE_COMPAT ?= $(CONFIG_CROSS_COMPILE_COMPAT_VDSO:"%"=%)
 +
 +  ifeq ($(CONFIG_CC_IS_CLANG), y)
 +    $(warning CROSS_COMPILE_COMPAT is clang, the compat vDSO will not be built)
 +  else ifeq ($(CROSS_COMPILE_COMPAT),)
 +    $(warning CROSS_COMPILE_COMPAT not defined or empty, the compat vDSO will not be built)
 +  else ifeq ($(shell which $(CROSS_COMPILE_COMPAT)gcc 2> /dev/null),)
 +    $(error $(CROSS_COMPILE_COMPAT)gcc not found, check CROSS_COMPILE_COMPAT)
 +  else
 +    export CROSS_COMPILE_COMPAT
 +    export CONFIG_COMPAT_VDSO := y
 +    compat_vdso := -DCONFIG_COMPAT_VDSO=1
 +  endif
 +endif
 +
 +KBUILD_CFLAGS += -mgeneral-regs-only $(lseinstr) $(brokengasinst) $(compat_vdso)
  KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
 -KBUILD_CFLAGS += -Wno-psabi
 -KBUILD_AFLAGS += $(lseinstr) $(brokengasinst)
 +KBUILD_CFLAGS += $(call cc-disable-warning, psabi)
 +KBUILD_AFLAGS += $(lseinstr) $(brokengasinst) $(compat_vdso)
  
  KBUILD_CFLAGS += $(call cc-option,-mabi=lp64)
  KBUILD_AFLAGS += $(call cc-option,-mabi=lp64)
@@@ -180,9 -162,6 +178,9 @@@ ifeq ($(KBUILD_EXTMOD),
  prepare: vdso_prepare
  vdso_prepare: prepare0
        $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso include/generated/vdso-offsets.h
 +      $(if $(CONFIG_COMPAT_VDSO),$(Q)$(MAKE) \
 +              $(build)=arch/arm64/kernel/vdso32  \
 +              include/generated/vdso32-offsets.h)
  endif
  
  define archhelp

diff --combined arch/s390/Makefile
index e48013c,df1d6a1..e0bab7e
--- 1/arch/s390/Makefile
--- 2/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@@ -10,8 -10,6 +10,6 @@@
  # Copyright (C) 1994 by Linus Torvalds
  #
  
- KBUILD_DEFCONFIG := defconfig
- 
  LD_BFD                := elf64-s390
  KBUILD_LDFLAGS        := -m elf64_s390
  KBUILD_AFLAGS_MODULE += -fPIC
@@@ -30,7 -28,6 +28,7 @@@ KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE
  KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float
  KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables
  KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-option,-ffreestanding)
 +KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, address-of-packed-member)
  KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)
  KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))
  UTS_MACHINE   := s390x

diff --combined scripts/kconfig/symbol.c
index 09fd6fa,b78650c..f56eec5
--- 1/scripts/kconfig/symbol.c
--- 2/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@@ -785,7 -785,7 +785,7 @@@ const char *sym_get_string_value(struc
        return (const char *)sym->curr.val;
  }
  
- bool sym_is_changable(struct symbol *sym)
+ bool sym_is_changeable(struct symbol *sym)
  {
        return sym->visible > sym->rev_dep.tri;
  }
@@@ -1114,7 -1114,7 +1114,7 @@@ static void sym_check_print_recursive(s
        }
  
        fprintf(stderr,
 -              "For a resolution refer to Documentation/kbuild/kconfig-language.txt\n"
 +              "For a resolution refer to Documentation/kbuild/kconfig-language.rst\n"
                "subsection \"Kconfig recursive dependency limitations\"\n"
                "\n");