Commit 9dd00138 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:

 - improve ARM implementation of pfn_valid()

 - various sparse fixes

 - spelling fixes

 - add further ARMv8 debug architecture versions

 - clang fix for decompressor

 - update to generic vDSO

 - remove Brahma-B53 from spectre hardening

 - initialise broadcast hrtimer device

 - use correct nm executable in decompressor

 - remove old mcount et.al.

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: (26 commits)
  ARM: 8940/1: ftrace: remove mcount(),ftrace_caller_old() and ftrace_call_old()
  ARM: 8939/1: kbuild: use correct nm executable
  ARM: 8938/1: kernel: initialize broadcast hrtimer based clock event device
  ARM: 8937/1: spectre-v2: remove Brahma-B53 from hardening
  ARM: 8933/1: replace Sun/Solaris style flag on section directive
  ARM: 8932/1: Add clock_gettime64 entry point
  ARM: 8931/1: Add clock_getres entry point
  ARM: 8930/1: Add support for generic vDSO
  ARM: 8929/1: use APSR_nzcv instead of r15 as mrc operand
  ARM: 8927/1: ARM/hw_breakpoint: add more ARMv8 debug architecture versions support
  ARM: 8918/2: only build return_address() if needed
  ARM: 8928/1: ARM_ERRATA_775420: Spelling s/date/data/
  ARM: 8925/1: tcm: include <asm/tcm.h> for missing declarations
  ARM: 8924/1: tcm: make dtcm_end and itcm_end static
  ARM: 8923/1: mm: include <asm/vga.h> for vga_base
  ARM: 8922/1: parse_dt_topology() rate is pointer to __be32
  ARM: 8920/1: share get_signal_page from signal.c to process.c
  ARM: 8919/1: make unexported functions static
  ARM: 8917/1: mm: include <asm/set_memory.h>
  ARM: 8916/1: mm: make set_section_perms() static
  ...
parents 2309d076 1a70cf0e

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ config ARM_ERRATA_775420 
       depends on CPU_V7

       help

	 This option enables the workaround for the 775420 Cortex-A9 (r2p2,

	 r2p6,r2p8,r2p10,r3p0) erratum. In case a date cache maintenance

	 r2p6,r2p8,r2p10,r3p0) erratum. In case a data cache maintenance

	 operation aborts with MMU exception, it might cause the processor

	 to deadlock. This workaround puts DSB before executing ISB if

	 an abort may occur on cache maintenance.

arch/arm/boot/bootp/init.S

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 *  size immediately following the kernel, we could build this into

 *  a binary blob, and concatenate the zImage using the cat command.

 */

		.section .start,#alloc,#execinstr

		.section .start, "ax"

		.type	_start, #function

		.globl	_start

arch/arm/boot/compressed/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin -I$(obj) 
asflags-y := -DZIMAGE



# Supply kernel BSS size to the decompressor via a linker symbol.

KBSS_SZ = $(shell echo $$(($$($(CROSS_COMPILE)nm $(obj)/../../../../vmlinux | \

KBSS_SZ = $(shell echo $$(($$($(NM) $(obj)/../../../../vmlinux | \

		sed -n -e 's/^\([^ ]*\) [AB] __bss_start$$/-0x\1/p' \

		       -e 's/^\([^ ]*\) [AB] __bss_stop$$/+0x\1/p') )) )

LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)
@@ -165,7 +165,7 @@ $(obj)/bswapsdi2.S: $(srctree)/arch/$(SRCARCH)/lib/bswapsdi2.S 
# The .data section is already discarded by the linker script so no need

# to bother about it here.

check_for_bad_syms = \

bad_syms=$$($(CROSS_COMPILE)nm $@ | sed -n 's/^.\{8\} [bc] \(.*\)/\1/p') && \

bad_syms=$$($(NM) $@ | sed -n 's/^.\{8\} [bc] \(.*\)/\1/p') && \

[ -z "$$bad_syms" ] || \

  ( echo "following symbols must have non local/private scope:" >&2; \

    echo "$$bad_syms" >&2; false )

arch/arm/boot/compressed/atags_to_fdt.c

+6 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ static int node_offset(void *fdt, const char *node_path) 
}



static int setprop(void *fdt, const char *node_path, const char *property,

		   uint32_t *val_array, int size)

		   void *val_array, int size)

{

	int offset = node_offset(fdt, node_path);

	if (offset < 0)
@@ -60,7 +60,7 @@ static uint32_t get_cell_size(const void *fdt) 
{

	int len;

	uint32_t cell_size = 1;

	const uint32_t *size_len =  getprop(fdt, "/", "#size-cells", &len);

	const __be32 *size_len =  getprop(fdt, "/", "#size-cells", &len);



	if (size_len)

		cell_size = fdt32_to_cpu(*size_len);
@@ -129,7 +129,7 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) 
	struct tag *atag = atag_list;

	/* In the case of 64 bits memory size, need to reserve 2 cells for

	 * address and size for each bank */

	uint32_t mem_reg_property[2 * 2 * NR_BANKS];

	__be32 mem_reg_property[2 * 2 * NR_BANKS];

	int memcount = 0;

	int ret, memsize;
@@ -138,7 +138,7 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) 
		return 1;



	/* if we get a DTB here we're done already */

	if (*(u32 *)atag_list == fdt32_to_cpu(FDT_MAGIC))

	if (*(__be32 *)atag_list == cpu_to_fdt32(FDT_MAGIC))

	       return 0;



	/* validate the ATAG */
@@ -177,8 +177,8 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) 
				/* if memsize is 2, that means that

				 * each data needs 2 cells of 32 bits,

				 * so the data are 64 bits */

				uint64_t *mem_reg_prop64 =

					(uint64_t *)mem_reg_property;

				__be64 *mem_reg_prop64 =

					(__be64 *)mem_reg_property;

				mem_reg_prop64[memcount++] =

					cpu_to_fdt64(atag->u.mem.start);

				mem_reg_prop64[memcount++] =

arch/arm/boot/compressed/big-endian.S

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *  Author: Nicolas Pitre

 */



	.section ".start", #alloc, #execinstr

	.section ".start", "ax"



	mrc	p15, 0, r0, c1, c0, 0	@ read control reg

	orr	r0, r0, #(1 << 7)	@ enable big endian mode

CRA Git | Maintained and supported by SUSTech CRA and CCSE