Merge branch 'misc' into fixes (39f4d441) · Commits · 戴 / test

Documentation/devicetree/bindings/arm/l2c2x0.yaml

+4 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,10 @@ properties:
		description: disable parity checking on the L2 cache (L220 or PL310).
		type: boolean

		marvell,ecc-enable:
		description: enable ECC protection on the L2 cache
		type: boolean

		arm,outer-sync-disable:
		description: disable the outer sync operation on the L2 cache.
		Some core tiles, especially ARM PB11MPCore have a faulty L220 cache that

+6 −0

Original line number	Diff line number	Diff line
		@@ -5755,6 +5755,12 @@ L: linux-edac@vger.kernel.org
		S: Maintained
		F: drivers/edac/amd64_edac*

		EDAC-ARMADA
		M: Jan Luebbe <jlu@pengutronix.de>
		L: linux-edac@vger.kernel.org
		S: Maintained
		F: drivers/edac/armada_xp_*

		EDAC-AST2500
		M: Stefan Schaeckeler <sschaeck@cisco.com>
		S: Supported

+4 −3

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ config ARM
		select HAVE_FAST_GUP if ARM_LPAE
		select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
		select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG
		select HAVE_FUNCTION_TRACER if !XIP_KERNEL
		select HAVE_FUNCTION_TRACER if !XIP_KERNEL && (CC_IS_GCC \|\| CLANG_VERSION >= 100000)
		select HAVE_GCC_PLUGINS
		select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 \|\| CPU_V6K \|\| CPU_V7)
		select HAVE_IDE if PCI \|\| ISA \|\| PCMCIA
		@@ -1572,8 +1572,9 @@ config ARM_PATCH_IDIV
		code to do integer division.

		config AEABI
		bool "Use the ARM EABI to compile the kernel" if !CPU_V7 && !CPU_V7M && !CPU_V6 && !CPU_V6K
		default CPU_V7 \|\| CPU_V7M \|\| CPU_V6 \|\| CPU_V6K
		bool "Use the ARM EABI to compile the kernel" if !CPU_V7 && \
		!CPU_V7M && !CPU_V6 && !CPU_V6K && !CC_IS_CLANG
		default CPU_V7 \|\| CPU_V7M \|\| CPU_V6 \|\| CPU_V6K \|\| CC_IS_CLANG
		help
		This option allows for the kernel to be compiled using the latest
		ARM ABI (aka EABI). This is only useful if you are using a user

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ choice

		config UNWINDER_FRAME_POINTER
		bool "Frame pointer unwinder"
		depends on !THUMB2_KERNEL && !CC_IS_CLANG
		depends on !THUMB2_KERNEL
		select ARCH_WANT_FRAME_POINTERS
		select FRAME_POINTER
		help

+14 −8

Original line number	Diff line number	Diff line
		@@ -36,7 +36,10 @@ KBUILD_CFLAGS += $(call cc-option,-mno-unaligned-access)
		endif

		ifeq ($(CONFIG_FRAME_POINTER),y)
		KBUILD_CFLAGS +=-fno-omit-frame-pointer -mapcs -mno-sched-prolog
		KBUILD_CFLAGS +=-fno-omit-frame-pointer
		ifeq ($(CONFIG_CC_IS_GCC),y)
		KBUILD_CFLAGS += -mapcs -mno-sched-prolog
		endif
		endif

		ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)
		@@ -112,6 +115,10 @@ ifeq ($(CONFIG_ARM_UNWIND),y)
		CFLAGS_ABI +=-funwind-tables
		endif

		ifeq ($(CONFIG_CC_IS_CLANG),y)
		CFLAGS_ABI += -meabi gnu
		endif

		# Accept old syntax despite ".syntax unified"
		AFLAGS_NOWARN :=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)

		@@ -270,14 +277,9 @@ endif

		export TEXT_OFFSET GZFLAGS MMUEXT

		# Do we have FASTFPE?
		FASTFPE :=arch/arm/fastfpe
		ifeq ($(FASTFPE),$(wildcard $(FASTFPE)))
		FASTFPE_OBJ :=$(FASTFPE)/
		endif

		core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/
		core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ)
		# Put arch/arm/fastfpe/ to use this.
		core-$(CONFIG_FPE_FASTFPE) += $(patsubst $(srctree)/%,%,$(wildcard $(srctree)/arch/arm/fastfpe/))
		core-$(CONFIG_VFP) += arch/arm/vfp/
		core-$(CONFIG_XEN) += arch/arm/xen/
		core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/
		@@ -290,6 +292,10 @@ core-y += arch/arm/net/
		core-y += arch/arm/crypto/
		core-y += $(machdirs) $(platdirs)

		# For cleaning
		core- += $(patsubst %,arch/arm/mach-%/, $(machine-))
		core- += $(patsubst %,arch/arm/plat-%/, $(plat-))

		drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/

		libs-y := arch/arm/lib/ $(libs-y)