From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 6 Jul 2021 18:52:58 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=77d34a4683b053108ecd466cc7c4193b45805528;p=linux.git

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
  ...
---

77d34a4683b053108ecd466cc7c4193b45805528
diff --cc arch/arm64/kernel/process.c
index 5ba0ed036deef,5591725cebccc..c8989b999250d
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@@ -70,8 -72,63 +70,6 @@@ EXPORT_SYMBOL(__stack_chk_guard)
  void (*pm_power_off)(void);
  EXPORT_SYMBOL_GPL(pm_power_off);
  
- void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
 -static void noinstr __cpu_do_idle(void)
 -{
 -	dsb(sy);
 -	wfi();
 -}
 -
 -static void noinstr __cpu_do_idle_irqprio(void)
 -{
 -	unsigned long pmr;
 -	unsigned long daif_bits;
 -
 -	daif_bits = read_sysreg(daif);
 -	write_sysreg(daif_bits | PSR_I_BIT | PSR_F_BIT, daif);
 -
 -	/*
 -	 * Unmask PMR before going idle to make sure interrupts can
 -	 * be raised.
 -	 */
 -	pmr = gic_read_pmr();
 -	gic_write_pmr(GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET);
 -
 -	__cpu_do_idle();
 -
 -	gic_write_pmr(pmr);
 -	write_sysreg(daif_bits, daif);
 -}
 -
 -/*
 - *	cpu_do_idle()
 - *
 - *	Idle the processor (wait for interrupt).
 - *
 - *	If the CPU supports priority masking we must do additional work to
 - *	ensure that interrupts are not masked at the PMR (because the core will
 - *	not wake up if we block the wake up signal in the interrupt controller).
 - */
 -void noinstr cpu_do_idle(void)
 -{
 -	if (system_uses_irq_prio_masking())
 -		__cpu_do_idle_irqprio();
 -	else
 -		__cpu_do_idle();
 -}
 -
 -/*
 - * This is our default idle handler.
 - */
 -void noinstr arch_cpu_idle(void)
 -{
 -	/*
 -	 * This should do all the clock switching and wait for interrupt
 -	 * tricks
 -	 */
 -	cpu_do_idle();
 -	raw_local_irq_enable();
 -}
--
  #ifdef CONFIG_HOTPLUG_CPU
  void arch_cpu_idle_dead(void)
  {