Merge branches 'for-next/acpi', 'for-next/cpufeatures', 'for-next/csum', 'for-next...
authorWill Deacon <will@kernel.org>
Wed, 22 Jan 2020 11:32:31 +0000 (11:32 +0000)
committerWill Deacon <will@kernel.org>
Wed, 22 Jan 2020 11:32:31 +0000 (11:32 +0000)
* for-next/acpi:
  ACPI/IORT: Fix 'Number of IDs' handling in iort_id_map()

* for-next/cpufeatures: (2 commits)
  arm64: Introduce ID_ISAR6 CPU register
  ...

* for-next/csum: (2 commits)
  arm64: csum: Fix pathological zero-length calls
  ...

* for-next/e0pd: (7 commits)
  arm64: kconfig: Fix alignment of E0PD help text
  ...

* for-next/entry: (5 commits)
  arm64: entry: cleanup sp_el0 manipulation
  ...

* for-next/kbuild: (4 commits)
  arm64: kbuild: remove compressed images on 'make ARCH=arm64 (dist)clean'
  ...

* for-next/kexec/cleanup: (11 commits)
  Revert "arm64: kexec: make dtb_mem always enabled"
  ...

* for-next/kexec/file-kdump: (2 commits)
  arm64: kexec_file: add crash dump support
  ...

* for-next/misc: (12 commits)
  arm64: entry: Avoid empty alternatives entries
  ...

* for-next/nofpsimd: (7 commits)
  arm64: nofpsmid: Handle TIF_FOREIGN_FPSTATE flag cleanly
  ...

* for-next/perf: (2 commits)
  perf/imx_ddr: Fix cpu hotplug state cleanup
  ...

* for-next/scs: (6 commits)
  arm64: kernel: avoid x18 in __cpu_soft_restart
  ...

1  2  3  4  5  6  7  8  9  10  11  12 
arch/arm64/Kconfig
arch/arm64/include/asm/lse.h
arch/arm64/include/asm/pgtable-hwdef.h
arch/arm64/include/asm/sysreg.h
arch/arm64/kernel/cpufeature.c
arch/arm64/kernel/entry.S
arch/arm64/mm/proc.S

Simple merge
@@@@@@@@@@@@@ -4,8 -4,8 -4,8 -4,8 -4,8 -4,8 -4,8 -4,8 -4,8 -4,8 -4,8 -4,10 +4,10 @@@@@@@@@@@@@
            
            #include <asm/atomic_ll_sc.h>
            
----- ------#if defined(CONFIG_AS_LSE) && defined(CONFIG_ARM64_LSE_ATOMICS)
+++++ ++++++#ifdef CONFIG_ARM64_LSE_ATOMICS
+++++ +++++ 
+++++++++++ #define __LSE_PREAMBLE      ".arch armv8-a+lse\n"
     +      
            #include <linux/compiler_types.h>
            #include <linux/export.h>
            #include <linux/jump_label.h>
@@@@@@@@@@@@@ -34,9 -34,9 -34,9 -34,9 -34,9 -34,9 -34,9 -34,9 -34,9 -34,9 -34,9 -34,9 +34,9 @@@@@@@@@@@@@ static inline bool system_uses_lse_atom
            
            /* In-line patching at runtime */
            #define ARM64_LSE_ATOMIC_INSN(llsc, lse)                            \
-----------     ALTERNATIVE(llsc, lse, ARM64_HAS_LSE_ATOMICS)
+++++++++++     ALTERNATIVE(llsc, __LSE_PREAMBLE lse, ARM64_HAS_LSE_ATOMICS)
            
----- ------#else       /* CONFIG_AS_LSE && CONFIG_ARM64_LSE_ATOMICS */
+++++ ++++++#else       /* CONFIG_ARM64_LSE_ATOMICS */
            
            static inline bool system_uses_lse_atomics(void) { return false; }
            
Simple merge
Simple merge
Simple merge
Simple merge