Merge branch 'parisc-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (69c5eea3) · Commits · 戴 / test

Pull parsic fix from Helge Deller: "Fix a recursive loop when running 'make ARCH=parisc defconfig'" * 'parisc-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Fix defconfig selection

arch/parisc/Kconfig

+5 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,11 @@ config MMU
		config STACK_GROWSUP
		def_bool y

		config ARCH_DEFCONFIG
		string
		default "arch/parisc/configs/generic-32bit_defconfig" if !64BIT
		default "arch/parisc/configs/generic-64bit_defconfig" if 64BIT

		config GENERIC_LOCKBREAK
		bool
		default y

+7 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,13 @@ CC_ARCHES = hppa hppa2.0 hppa1.1
		LD_BFD := elf32-hppa-linux
		endif

		# select defconfig based on actual architecture
		ifeq ($(shell uname -m),parisc64)
		KBUILD_DEFCONFIG := generic-64bit_defconfig
		else
		KBUILD_DEFCONFIG := generic-32bit_defconfig
		endif

		export LD_BFD

		ifneq ($(SUBARCH),$(UTS_MACHINE))