Commit 77d34a46 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:

 - Make it clear __swp_entry_to_pte() uses PTE_TYPE_FAULT

 - Updates for setting vmalloc size via command line to resolve an issue
   with the 8MiB hole not properly being accounted for, and clean up the
   code.

 - ftrace support for module PLTs

 - Spelling fixes

 - kbuild updates for removing generated files and pattern rules for
   generating files

 - Clang/llvm updates

 - Change the way the kernel is mapped, placing it in vmalloc space
   instead.

 - Remove arm_pm_restart from arm and aarch64.

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: (29 commits)
  ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE
  ARM: 9097/1: mmu: Declare section start/end correctly
  ARM: 9096/1: Remove arm_pm_restart()
  ARM: 9095/1: ARM64: Remove arm_pm_restart()
  ARM: 9094/1: Register with kernel restart handler
  ARM: 9093/1: drivers: firmwapsci: Register with kernel restart handler
  ARM: 9092/1: xen: Register with kernel restart handler
  ARM: 9091/1: Revert "mm: qsd8x50: Fix incorrect permission faults"
  ARM: 9090/1: Map the lowmem and kernel separately
  ARM: 9089/1: Define kernel physical section start and end
  ARM: 9088/1: Split KERNEL_OFFSET from PAGE_OFFSET
  ARM: 9087/1: kprobes: test-thumb: fix for LLVM_IAS=1
  ARM: 9086/1: syscalls: use pattern rules to generate syscall headers
  ARM: 9085/1: remove unneeded abi parameter to syscallnr.sh
  ARM: 9084/1: simplify the build rule of mach-types.h
  ARM: 9083/1: uncompress: atags_to_fdt: Spelling s/REturn/Return/
  ARM: 9082/1: [v2] mark prepare_page_table as __init
  ARM: 9079/1: ftrace: Add MODULE_PLTS support
  ARM: 9078/1: Add warn suppress parameter to arm_gen_branch_link()
  ARM: 9077/1: PLT: Move struct plt_entries definition to header
  ...
parents 4c55e2ae 6fa630bf

arch/arm/Kconfig.debug

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ config UNWINDER_FRAME_POINTER 
config UNWINDER_ARM

	bool "ARM EABI stack unwinder"

	depends on AEABI && !FUNCTION_GRAPH_TRACER

	# https://github.com/ClangBuiltLinux/linux/issues/732

	depends on !LD_IS_LLD || LLD_VERSION >= 110000

	select ARM_UNWIND

	help

	  This option enables stack unwinding support in the kernel

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 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 hyp-stub.S

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



KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING

arch/arm/boot/compressed/atags_to_fdt.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static void hex_str(char *out, uint32_t value) 
/*

 * Convert and fold provided ATAGs into the provided FDT.

 *

 * REturn values:

 * Return values:

 *    = 0 -> pretend success

 *    = 1 -> bad ATAG (may retry with another possible ATAG pointer)

 *    < 0 -> error from libfdt

arch/arm/include/asm/ftrace.h

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ extern void __gnu_mcount_nc(void); 


#ifdef CONFIG_DYNAMIC_FTRACE

struct dyn_arch_ftrace {

#ifdef CONFIG_ARM_MODULE_PLTS

	struct module *mod;

#endif

};



static inline unsigned long ftrace_call_adjust(unsigned long addr)

arch/arm/include/asm/insn.h

+4 −4
Original line number Diff line number Diff line
@@ -13,18 +13,18 @@ arm_gen_nop(void) 
}



unsigned long

__arm_gen_branch(unsigned long pc, unsigned long addr, bool link);

__arm_gen_branch(unsigned long pc, unsigned long addr, bool link, bool warn);



static inline unsigned long

arm_gen_branch(unsigned long pc, unsigned long addr)

{

	return __arm_gen_branch(pc, addr, false);

	return __arm_gen_branch(pc, addr, false, true);

}



static inline unsigned long

arm_gen_branch_link(unsigned long pc, unsigned long addr)

arm_gen_branch_link(unsigned long pc, unsigned long addr, bool warn)

{

	return __arm_gen_branch(pc, addr, true);

	return __arm_gen_branch(pc, addr, true, warn);

}



#endif