Commit 35776f10 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM development updates from Russell King:

 - Rename "mod_init" and "mod_exit" so that initcall debug output is
   actually useful (Randy Dunlap)

 - Update maintainers entries for linux-arm-kernel to indicate it is
   moderated for non-subscribers (Randy Dunlap)

 - Move install rules to arch/arm/Makefile (Masahiro Yamada)

 - Drop unnecessary ARCH_NR_GPIOS definition (Linus Walleij)

 - Don't warn about atags_to_fdt() stack size (David Heidelberg)

 - Speed up unaligned copy_{from,to}_kernel_nofault (Arnd Bergmann)

 - Get rid of set_fs() usage (Arnd Bergmann)

 - Remove checks for GCC prior to v4.6 (Geert Uytterhoeven)

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9118/1: div64: Remove always-true __div64_const32_is_OK() duplicate
  ARM: 9117/1: asm-generic: div64: Remove always-true __div64_const32_is_OK()
  ARM: 9116/1: unified: Remove check for gcc < 4
  ARM: 9110/1: oabi-compat: fix oabi epoll sparse warning
  ARM: 9113/1: uaccess: remove set_fs() implementation
  ARM: 9112/1: uaccess: add __{get,put}_kernel_nofault
  ARM: 9111/1: oabi-compat: rework fcntl64() emulation
  ARM: 9114/1: oabi-compat: rework sys_semtimedop emulation
  ARM: 9108/1: oabi-compat: rework epoll_wait/epoll_pwait emulation
  ARM: 9107/1: syscall: always store thread_info->abi_syscall
  ARM: 9109/1: oabi-compat: add epoll_pwait handler
  ARM: 9106/1: traps: use get_kernel_nofault instead of set_fs()
  ARM: 9115/1: mm/maccess: fix unaligned copy_{from,to}_kernel_nofault
  ARM: 9105/1: atags_to_fdt: don't warn about stack size
  ARM: 9103/1: Drop ARCH_NR_GPIOS definition
  ARM: 9102/1: move theinstall rules to arch/arm/Makefile
  ARM: 9100/1: MAINTAINERS: mark all linux-arm-kernel@infradead list as moderated
  ARM: 9099/1: crypto: rename 'mod_init' & 'mod_exit' functions to be module-specific
parents 43175623 6c974e79
Loading
Loading
Loading
Loading
+28 −28
Original line number Diff line number Diff line
@@ -2334,14 +2334,14 @@ N: oxnas
ARM/PALM TREO SUPPORT
M:	Tomas Cech <sleep_walker@suse.com>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
W:	http://hackndev.com
F:	arch/arm/mach-pxa/palmtreo.*
ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
M:	Marek Vasut <marek.vasut@gmail.com>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
W:	http://hackndev.com
F:	arch/arm/mach-pxa/include/mach/palmld.h
@@ -2355,7 +2355,7 @@ F: arch/arm/mach-pxa/palmtx.c
ARM/PALMZ72 SUPPORT
M:	Sergey Lapin <slapin@ossfans.org>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
W:	http://hackndev.com
F:	arch/arm/mach-pxa/palmz72.*
@@ -2525,7 +2525,7 @@ N: s5pv210
ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
M:	Andrzej Hajda <a.hajda@samsung.com>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L:	linux-media@vger.kernel.org
S:	Maintained
F:	drivers/media/platform/s5p-g2d/
@@ -2542,14 +2542,14 @@ ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
M:	Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
M:	Jacek Anaszewski <jacek.anaszewski@gmail.com>
M:	Sylwester Nawrocki <s.nawrocki@samsung.com>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L:	linux-media@vger.kernel.org
S:	Maintained
F:	drivers/media/platform/s5p-jpeg/
ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
M:	Andrzej Hajda <a.hajda@samsung.com>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L:	linux-media@vger.kernel.org
S:	Maintained
F:	drivers/media/platform/s5p-mfc/
@@ -3568,7 +3568,7 @@ BROADCOM BCM5301X ARM ARCHITECTURE
M:	Hauke Mehrtens <hauke@hauke-m.de>
M:	Rafał Miłecki <zajec5@gmail.com>
M:	bcm-kernel-feedback-list@broadcom.com
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	arch/arm/boot/dts/bcm470*
F:	arch/arm/boot/dts/bcm5301*
@@ -3578,7 +3578,7 @@ F: arch/arm/mach-bcm/bcm_5301x.c
BROADCOM BCM53573 ARM ARCHITECTURE
M:	Rafał Miłecki <rafal@milecki.pl>
L:	bcm-kernel-feedback-list@broadcom.com
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	arch/arm/boot/dts/bcm47189*
F:	arch/arm/boot/dts/bcm53573*
@@ -4874,7 +4874,7 @@ CPUIDLE DRIVER - ARM BIG LITTLE
M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
M:	Daniel Lezcano <daniel.lezcano@linaro.org>
L:	linux-pm@vger.kernel.org
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
F:	drivers/cpuidle/cpuidle-big_little.c
@@ -4894,14 +4894,14 @@ CPUIDLE DRIVER - ARM PSCI
M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
M:	Sudeep Holla <sudeep.holla@arm.com>
L:	linux-pm@vger.kernel.org
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Supported
F:	drivers/cpuidle/cpuidle-psci.c
CPUIDLE DRIVER - ARM PSCI PM DOMAIN
M:	Ulf Hansson <ulf.hansson@linaro.org>
L:	linux-pm@vger.kernel.org
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Supported
F:	drivers/cpuidle/cpuidle-psci.h
F:	drivers/cpuidle/cpuidle-psci-domain.c
@@ -7272,7 +7272,7 @@ F: tools/firewire/
FIRMWARE FRAMEWORK FOR ARMV8-A
M:	Sudeep Holla <sudeep.holla@arm.com>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	drivers/firmware/arm_ffa/
F:	include/linux/arm_ffa.h
@@ -7451,7 +7451,7 @@ F: include/linux/platform_data/video-imxfb.h
FREESCALE IMX DDR PMU DRIVER
M:	Frank Li <Frank.li@nxp.com>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	Documentation/admin-guide/perf/imx-ddr.rst
F:	Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml
@@ -7543,7 +7543,7 @@ F: drivers/tty/serial/ucc_uart.c
FREESCALE SOC DRIVERS
M:	Li Yang <leoyang.li@nxp.com>
L:	linuxppc-dev@lists.ozlabs.org
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml
F:	Documentation/devicetree/bindings/soc/fsl/
@@ -11191,7 +11191,7 @@ F: drivers/net/wireless/marvell/libertas/
MARVELL MACCHIATOBIN SUPPORT
M:	Russell King <linux@armlinux.org.uk>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
@@ -14272,7 +14272,7 @@ F: drivers/pci/controller/pcie-altera.c
PCI DRIVER FOR APPLIEDMICRO XGENE
M:	Toan Le <toan@os.amperecomputing.com>
L:	linux-pci@vger.kernel.org
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	Documentation/devicetree/bindings/pci/xgene-pci.txt
F:	drivers/pci/controller/pci-xgene.c
@@ -14280,7 +14280,7 @@ F: drivers/pci/controller/pci-xgene.c
PCI DRIVER FOR ARM VERSATILE PLATFORM
M:	Rob Herring <robh@kernel.org>
L:	linux-pci@vger.kernel.org
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	Documentation/devicetree/bindings/pci/versatile.yaml
F:	drivers/pci/controller/pci-versatile.c
@@ -14288,7 +14288,7 @@ F: drivers/pci/controller/pci-versatile.c
PCI DRIVER FOR ARMADA 8K
M:	Thomas Petazzoni <thomas.petazzoni@bootlin.com>
L:	linux-pci@vger.kernel.org
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	Documentation/devicetree/bindings/pci/pci-armada8k.txt
F:	drivers/pci/controller/dwc/pcie-armada8k.c
@@ -14306,7 +14306,7 @@ M: Mingkai Hu <mingkai.hu@nxp.com>
M:	Roy Zang <roy.zang@nxp.com>
L:	linuxppc-dev@lists.ozlabs.org
L:	linux-pci@vger.kernel.org
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	drivers/pci/controller/dwc/*layerscape*
@@ -14386,7 +14386,7 @@ F: drivers/pci/controller/pci-tegra.c
PCI DRIVER FOR NXP LAYERSCAPE GEN4 CONTROLLER
M:	Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
L:	linux-pci@vger.kernel.org
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
F:	drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c
@@ -14421,7 +14421,7 @@ PCI DRIVER FOR TI DRA7XX/J721E
M:	Kishon Vijay Abraham I <kishon@ti.com>
L:	linux-omap@vger.kernel.org
L:	linux-pci@vger.kernel.org
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Supported
F:	Documentation/devicetree/bindings/pci/ti-pci.txt
F:	drivers/pci/controller/cadence/pci-j721e.c
@@ -14477,7 +14477,7 @@ F: drivers/pci/controller/pcie-altera-msi.c
PCI MSI DRIVER FOR APPLIEDMICRO XGENE
M:	Toan Le <toan@os.amperecomputing.com>
L:	linux-pci@vger.kernel.org
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
F:	drivers/pci/controller/pci-xgene-msi.c
@@ -14994,7 +14994,7 @@ F: include/linux/dtpm.h
POWER STATE COORDINATION INTERFACE (PSCI)
M:	Mark Rutland <mark.rutland@arm.com>
M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	drivers/firmware/psci/
F:	include/linux/psci.h
@@ -15519,7 +15519,7 @@ F: arch/hexagon/
QUALCOMM HIDMA DRIVER
M:	Sinan Kaya <okaya@kernel.org>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L:	linux-arm-msm@vger.kernel.org
L:	dmaengine@vger.kernel.org
S:	Supported
@@ -17233,7 +17233,7 @@ SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC)
M:	Mark Rutland <mark.rutland@arm.com>
M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
M:	Sudeep Holla <sudeep.holla@arm.com>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	drivers/firmware/smccc/
F:	include/linux/arm-smccc.h
@@ -17350,7 +17350,7 @@ F: drivers/media/pci/solo6x10/
SOFTWARE DELEGATED EXCEPTION INTERFACE (SDEI)
M:	James Morse <james.morse@arm.com>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	Documentation/devicetree/bindings/arm/firmware/sdei.txt
F:	drivers/firmware/arm_sdei.c
@@ -18137,7 +18137,7 @@ F: drivers/mfd/syscon.c
SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers
M:	Sudeep Holla <sudeep.holla@arm.com>
R:	Cristian Marussi <cristian.marussi@arm.com>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	Documentation/devicetree/bindings/firmware/arm,sc[mp]i.yaml
F:	drivers/clk/clk-sc[mp]i.c
@@ -18510,7 +18510,7 @@ TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER
M:	Nishanth Menon <nm@ti.com>
M:	Tero Kristo <kristo@kernel.org>
M:	Santosh Shilimkar <ssantosh@kernel.org>
L:	linux-arm-kernel@lists.infradead.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
F:	Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ config ARM
	select PCI_SYSCALL if PCI
	select PERF_USE_VMALLOC
	select RTC_LIB
	select SET_FS
	select SYS_SUPPORTS_APM_EMULATION
	select TRACE_IRQFLAGS_SUPPORT if !CPU_V7M
	# Above selects are sorted alphabetically; please add new ones
+2 −1
Original line number Diff line number Diff line
@@ -308,7 +308,8 @@ $(BOOT_TARGETS): vmlinux
	@$(kecho) '  Kernel: $(boot)/$@ is ready'

$(INSTALL_TARGETS):
	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
	$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh "$(KERNELRELEASE)" \
	$(boot)/$(patsubst %install,%Image,$@) System.map "$(INSTALL_PATH)"

PHONY += vdso_install
vdso_install:
+1 −13
Original line number Diff line number Diff line
@@ -96,23 +96,11 @@ $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
$(obj)/bootpImage: $(obj)/bootp/bootp FORCE
	$(call if_changed,objcopy)

PHONY += initrd install zinstall uinstall
PHONY += initrd
initrd:
	@test "$(INITRD_PHYS)" != "" || \
	(echo This machine does not support INITRD; exit -1)
	@test "$(INITRD)" != "" || \
	(echo You must specify INITRD; exit -1)

install:
	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
	$(obj)/Image System.map "$(INSTALL_PATH)"

zinstall:
	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
	$(obj)/zImage System.map "$(INSTALL_PATH)"

uinstall:
	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
	$(obj)/uImage System.map "$(INSTALL_PATH)"

subdir-	    := bootp compressed dts
+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ compress-$(CONFIG_KERNEL_LZ4) = lz4
libfdt_objs := fdt_rw.o fdt_ro.o fdt_wip.o fdt.o

ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y)
CFLAGS_REMOVE_atags_to_fdt.o += -Wframe-larger-than=${CONFIG_FRAME_WARN}
CFLAGS_atags_to_fdt.o += -Wframe-larger-than=1280
OBJS	+= $(libfdt_objs) atags_to_fdt.o
endif
ifeq ($(CONFIG_USE_OF),y)
Loading