Commit 01d8a748 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 051e6b7e d51c2145
...@@ -177,6 +177,7 @@ void machine_kexec(struct kimage *kimage) ...@@ -177,6 +177,7 @@ void machine_kexec(struct kimage *kimage)
* the offline CPUs. Therefore, we must use the __* variant here. * the offline CPUs. Therefore, we must use the __* variant here.
*/ */
__flush_icache_range((uintptr_t)reboot_code_buffer, __flush_icache_range((uintptr_t)reboot_code_buffer,
(uintptr_t)reboot_code_buffer +
arm64_relocate_new_kernel_size); arm64_relocate_new_kernel_size);
/* Flush the kimage list and its buffers. */ /* Flush the kimage list and its buffers. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment