From: Will Deacon <will@kernel.org>
Date: Wed, 22 Jan 2020 11:32:31 +0000 (+0000)
Subject: Merge branches 'for-next/acpi', 'for-next/cpufeatures', 'for-next/csum', 'for-next... 
X-Git-Tag: v5.6-rc1~208^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f6cdf296cc4b5b25c85bd04a84b59e562ce234b;p=thirdparty%2Fkernel%2Flinux.git

Merge branches 'for-next/acpi', 'for-next/cpufeatures', 'for-next/csum', 'for-next/e0pd', 'for-next/entry', 'for-next/kbuild', 'for-next/kexec/cleanup', 'for-next/kexec/file-kdump', 'for-next/misc', 'for-next/nofpsimd', 'for-next/perf' and 'for-next/scs' into for-next/core

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

4f6cdf296cc4b5b25c85bd04a84b59e562ce234b
diff --cc arch/arm64/include/asm/lse.h
index 80b3882781496,80b3882781496,80b3882781496,80b3882781496,80b3882781496,4e1009fff686f,80b3882781496,80b3882781496,80b3882781496,80b3882781496,80b3882781496,73834996c4b6d..d429f7701c367
--- a/arch/arm64/include/asm/lse.h
+++ b/arch/arm64/include/asm/lse.h
@@@@@@@@@@@@@ -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; }