aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-05-15 11:08:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-05-15 11:08:46 -0700
commit01d8a7480304a2f0e196459eb4061e171d9e9922 (patch)
treec0c42e2680d493feb15cbf9d89a445e93124ee89
parentMerge tag 'hwmon-for-v5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (diff)
parentarm64: fix the flush_icache_range arguments in machine_kexec (diff)
downloadwireguard-linux-01d8a7480304a2f0e196459eb4061e171d9e9922.tar.xz
wireguard-linux-01d8a7480304a2f0e196459eb4061e171d9e9922.zip
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas: "Fix flush_icache_range() second argument in machine_kexec() to be an address rather than size" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: fix the flush_icache_range arguments in machine_kexec
-rw-r--r--arch/arm64/kernel/machine_kexec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index 8e9c924423b4..a0b144cfaea7 100644
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -177,6 +177,7 @@ void machine_kexec(struct kimage *kimage)
* the offline CPUs. Therefore, we must use the __* variant here.
*/
__flush_icache_range((uintptr_t)reboot_code_buffer,
+ (uintptr_t)reboot_code_buffer +
arm64_relocate_new_kernel_size);
/* Flush the kimage list and its buffers. */