Commit 322a3b84 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:

 - Fix BSS size calculation for LLVM

 - Improve robustness of kernel entry around v7_invalidate_l1

 - Fix and update kprobes assembly

 - Correct breakpoint overflow handler check

 - Pause function graph tracer when suspending a CPU

 - Switch to generic syscallhdr.sh and syscalltbl.sh

 - Remove now unused set_kernel_text_r[wo] functions

 - Updates for ptdump (__init marking and using DEFINE_SHOW_ATTRIBUTE)

 - Fix for interrupted SMC (secure) calls

 - Remove Compaq Personal Server platform

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: footbridge: remove personal server platform
  ARM: 9075/1: kernel: Fix interrupted SMC calls
  ARM: 9074/1: ptdump: convert to DEFINE_SHOW_ATTRIBUTE
  ARM: 9073/1: ptdump: add __init section marker to three functions
  ARM: 9072/1: mm: remove set_kernel_text_r[ow]()
  ARM: 9067/1: syscalls: switch to generic syscallhdr.sh
  ARM: 9068/1: syscalls: switch to generic syscalltbl.sh
  ARM: 9066/1: ftrace: pause/unpause function graph tracer in cpu_suspend()
  ARM: 9064/1: hw_breakpoint: Do not directly check the event's overflow_handler hook
  ARM: 9062/1: kprobes: rewrite test-arm.c in UAL
  ARM: 9061/1: kprobes: fix UNPREDICTABLE warnings
  ARM: 9060/1: kexec: Remove unused kexec_reinit callback
  ARM: 9059/1: cache-v7: get rid of mini-stack
  ARM: 9058/1: cache-v7: refactor v7_invalidate_l1 to avoid clobbering r5/r6
  ARM: 9057/1: cache-v7: add missing ISB after cache level selection
  ARM: 9056/1: decompressor: fix BSS size calculation for LLVM ld.lld
parents 939b7cbc 298a58e1

arch/arm/boot/compressed/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ asflags-y := -DZIMAGE 


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

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') )) )

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

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

LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)

# Supply ZRELADDR to the decompressor via a linker symbol.

ifneq ($(CONFIG_AUTO_ZRELADDR),y)

arch/arm/configs/footbridge_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ CONFIG_EXPERT=y 
CONFIG_MODULES=y

CONFIG_ARCH_FOOTBRIDGE=y

CONFIG_ARCH_CATS=y

CONFIG_ARCH_PERSONAL_SERVER=y

CONFIG_ARCH_EBSA285_HOST=y

CONFIG_ARCH_NETWINDER=y

CONFIG_LEDS=y

arch/arm/include/asm/kexec.h

+0 −3
Original line number Diff line number Diff line
@@ -56,9 +56,6 @@ static inline void crash_setup_regs(struct pt_regs *newregs, 
	}

}



/* Function pointer to optional machine-specific reinitialization */

extern void (*kexec_reinit)(void);



static inline unsigned long phys_to_boot_phys(phys_addr_t phys)

{

	return phys_to_idmap(phys);

arch/arm/include/asm/memory.h

+0 −15
Original line number Diff line number Diff line
@@ -150,21 +150,6 @@ extern unsigned long vectors_base; 
 */

#define PLAT_PHYS_OFFSET	UL(CONFIG_PHYS_OFFSET)



#ifdef CONFIG_XIP_KERNEL

/*

 * When referencing data in RAM from the XIP region in a relative manner

 * with the MMU off, we need the relative offset between the two physical

 * addresses.  The macro below achieves this, which is:

 *    __pa(v_data) - __xip_pa(v_text)

 */

#define PHYS_RELATIVE(v_data, v_text) \

	(((v_data) - PAGE_OFFSET + PLAT_PHYS_OFFSET) - \

	 ((v_text) - XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR) + \

          CONFIG_XIP_PHYS_ADDR))

#else

#define PHYS_RELATIVE(v_data, v_text) ((v_data) - (v_text))

#endif



#ifndef __ASSEMBLY__



/*

arch/arm/include/asm/set_memory.h

+0 −8
Original line number Diff line number Diff line
@@ -18,12 +18,4 @@ static inline int set_memory_x(unsigned long addr, int numpages) { return 0; } 
static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }

#endif



#ifdef CONFIG_STRICT_KERNEL_RWX

void set_kernel_text_rw(void);

void set_kernel_text_ro(void);

#else

static inline void set_kernel_text_rw(void) { }

static inline void set_kernel_text_ro(void) { }

#endif



#endif