Commit c2b0fc84 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 updates from Russell King:

 - remove a now unnecessary usage of the KERNEL_DS for
   sys_oabi_epoll_ctl()

 - update my email address in a number of drivers

 - decompressor EFI updates from Ard Biesheuvel

 - module unwind section handling updates

 - sparsemem Kconfig cleanups

 - make act_mm macro respect THREAD_SIZE

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8980/1: Allow either FLATMEM or SPARSEMEM on the multiplatform build
  ARM: 8979/1: Remove redundant ARCH_SPARSEMEM_DEFAULT setting
  ARM: 8978/1: mm: make act_mm() respect THREAD_SIZE
  ARM: decompressor: run decompressor in place if loaded via UEFI
  ARM: decompressor: move GOT into .data for EFI enabled builds
  ARM: decompressor: defer loading of the contents of the LC0 structure
  ARM: decompressor: split off _edata and stack base into separate object
  ARM: decompressor: move headroom variable out of LC0
  ARM: 8976/1: module: allow arch overrides for .init section names
  ARM: 8975/1: module: fix handling of unwind init sections
  ARM: 8974/1: use SPARSMEM_STATIC when SPARSEMEM is enabled
  ARM: 8971/1: replace the sole use of a symbol with its definition
  ARM: 8969/1: decompressor: simplify libfdt builds
  Update rmk's email address in various drivers
  ARM: compat: remove KERNEL_DS usage in sys_oabi_epoll_ctl()
parents 533b220f fb597f2a

arch/arm/Kconfig

+10 −3
Original line number Diff line number Diff line
@@ -313,6 +313,9 @@ choice 
config ARCH_MULTIPLATFORM

	bool "Allow multiple platforms to be selected"

	depends on MMU

	select ARCH_FLATMEM_ENABLE

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_SELECT_MEMORY_MODEL

	select ARM_HAS_SG_CHAIN

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR
@@ -1516,11 +1519,15 @@ config OABI_COMPAT 
config ARCH_HAS_HOLES_MEMORYMODEL

	bool



config ARCH_SPARSEMEM_ENABLE

config ARCH_SELECT_MEMORY_MODEL

	bool



config ARCH_FLATMEM_ENABLE

	bool



config ARCH_SPARSEMEM_DEFAULT

	def_bool ARCH_SPARSEMEM_ENABLE

config ARCH_SPARSEMEM_ENABLE

	bool

	select SPARSEMEM_STATIC if SPARSEMEM



config HAVE_ARCH_PFN_VALID

	def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM

arch/arm/boot/compressed/.gitignore

+0 −9
Original line number Diff line number Diff line
@@ -7,12 +7,3 @@ hyp-stub.S 
piggy_data

vmlinux

vmlinux.lds
 


# borrowed libfdt files

fdt.c

fdt.h

fdt_ro.c

fdt_rw.c

fdt_wip.c

libfdt.h

libfdt_internal.h

arch/arm/boot/compressed/Makefile

+15 −23
Original line number Diff line number Diff line
@@ -76,29 +76,30 @@ compress-$(CONFIG_KERNEL_LZMA) = lzma 
compress-$(CONFIG_KERNEL_XZ)   = xzkern

compress-$(CONFIG_KERNEL_LZ4)  = lz4



# Borrowed libfdt files for the ATAG compatibility mode



libfdt		:= fdt_rw.c fdt_ro.c fdt_wip.c fdt.c

libfdt_hdrs	:= fdt.h libfdt.h libfdt_internal.h



libfdt_objs	:= $(addsuffix .o, $(basename $(libfdt)))



$(addprefix $(obj)/,$(libfdt) $(libfdt_hdrs)): $(obj)/%: $(srctree)/scripts/dtc/libfdt/%

	$(call cmd,shipped)



$(addprefix $(obj)/,$(libfdt_objs) atags_to_fdt.o): \

	$(addprefix $(obj)/,$(libfdt_hdrs))

libfdt_objs := fdt_rw.o fdt_ro.o fdt_wip.o fdt.o



ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y)

OBJS	+= $(libfdt_objs) atags_to_fdt.o

endif



# -fstack-protector-strong triggers protection checks in this code,

# but it is being used too early to link to meaningful stack_chk logic.

nossp-flags-$(CONFIG_CC_HAS_STACKPROTECTOR_NONE) := -fno-stack-protector

$(foreach o, $(libfdt_objs) atags_to_fdt.o, \

	$(eval CFLAGS_$(o) := -I $(srctree)/scripts/dtc/libfdt $(nossp-flags-y)))



# These were previously generated C files. When you are building the kernel

# with O=, make sure to remove the stale files in the output tree. Otherwise,

# the build system wrongly compiles the stale ones.

ifdef building_out_of_srctree

$(shell rm -f $(addprefix $(obj)/, fdt_rw.c fdt_ro.c fdt_wip.c fdt.c))

endif



targets       := vmlinux vmlinux.lds piggy_data piggy.o \

		 lib1funcs.o ashldi3.o bswapsdi2.o \

		 head.o $(OBJS)



clean-files += piggy_data lib1funcs.S ashldi3.S bswapsdi2.S \

		$(libfdt) $(libfdt_hdrs) hyp-stub.S

clean-files += piggy_data lib1funcs.S ashldi3.S bswapsdi2.S hyp-stub.S



KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
@@ -107,15 +108,6 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS) 
KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))

endif



# -fstack-protector-strong triggers protection checks in this code,

# but it is being used too early to link to meaningful stack_chk logic.

nossp-flags-$(CONFIG_CC_HAS_STACKPROTECTOR_NONE) := -fno-stack-protector

CFLAGS_atags_to_fdt.o := $(nossp-flags-y)

CFLAGS_fdt.o := $(nossp-flags-y)

CFLAGS_fdt_ro.o := $(nossp-flags-y)

CFLAGS_fdt_rw.o := $(nossp-flags-y)

CFLAGS_fdt_wip.o := $(nossp-flags-y)



ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin \

	     -I$(obj) $(DISABLE_ARM_SSP_PER_TASK_PLUGIN)

asflags-y := -DZIMAGE

arch/arm/boot/compressed/atags_to_fdt.c

+1 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/libfdt_env.h>

#include <asm/setup.h>

#include <libfdt.h>

arch/arm/boot/compressed/fdt.c

0 → 100644
+2 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

#include "../../../../lib/fdt.c"

CRA Git | Maintained and supported by SUSTech CRA and CCSE