The patch titled
Subject: kexec-bzimage64: fix the ordering of registers
has been removed from the -mm tree. Its filename was
kexec-support-for-kexec-on-panic-using-new-system-call-fix.patch
This patch was dropped because it was folded into kexec-support-for-kexec-on-panic-using-new-system-call.patch
------------------------------------------------------
From: Vivek Goyal <vgoyal@xxxxxxxxxx>
Subject: kexec-bzimage64: fix the ordering of registers
hpa suggested to fix the ordering of register declaration.
Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/kexec.h | 11 ++++++++---
arch/x86/purgatory/entry64.S | 6 +++---
2 files changed, 11 insertions(+), 6 deletions(-)
diff -puN arch/x86/include/asm/kexec.h~kexec-support-for-kexec-on-panic-using-new-system-call-fix arch/x86/include/asm/kexec.h
--- a/arch/x86/include/asm/kexec.h~kexec-support-for-kexec-on-panic-using-new-system-call-fix
+++ a/arch/x86/include/asm/kexec.h
@@ -182,15 +182,20 @@ struct kimage_arch {
#endif /* CONFIG_X86_32 */
#ifdef CONFIG_X86_64
+/*
+ * Number of elements and order of elements in this structure should match
+ * with the ones in arch/x86/purgatory/entry64.S. If you make a change here
+ * make an appropriate change in purgatory too.
+ */
struct kexec_entry64_regs {
uint64_t rax;
- uint64_t rbx;
uint64_t rcx;
uint64_t rdx;
- uint64_t rsi;
- uint64_t rdi;
+ uint64_t rbx;
uint64_t rsp;
uint64_t rbp;
+ uint64_t rsi;
+ uint64_t rdi;
uint64_t r8;
uint64_t r9;
uint64_t r10;
diff -puN arch/x86/purgatory/entry64.S~kexec-support-for-kexec-on-panic-using-new-system-call-fix arch/x86/purgatory/entry64.S
--- a/arch/x86/purgatory/entry64.S~kexec-support-for-kexec-on-panic-using-new-system-call-fix
+++ a/arch/x86/purgatory/entry64.S
@@ -61,13 +61,13 @@ new_cs_exit:
.balign 4
entry64_regs:
rax: .quad 0x0
-rbx: .quad 0x0
rcx: .quad 0x0
rdx: .quad 0x0
-rsi: .quad 0x0
-rdi: .quad 0x0
+rbx: .quad 0x0
rsp: .quad 0x0
rbp: .quad 0x0
+rsi: .quad 0x0
+rdi: .quad 0x0
r8: .quad 0x0
r9: .quad 0x0
r10: .quad 0x0
_
Patches currently in -mm which might be from vgoyal@xxxxxxxxxx are
origin.patch
mmap_vmcore-skip-non-ram-pages-reported-by-hypervisors.patch
bin2c-move-bin2c-in-scripts-basic.patch
kernel-build-bin2c-based-on-config-option-config_build_bin2c.patch
kexec-rename-unusebale_pages-to-unusable_pages.patch
kexec-move-segment-verification-code-in-a-separate-function.patch
kexec-use-common-function-for-kimage_normal_alloc-and-kimage_crash_alloc.patch
resource-provide-new-functions-to-walk-through-resources.patch
kexec-make-kexec_segment-user-buffer-pointer-a-union.patch
kexec-new-syscall-kexec_file_load-declaration.patch
kexec-implementation-of-new-syscall-kexec_file_load.patch
purgatory-sha256-provide-implementation-of-sha256-in-purgaotory-context.patch
purgatory-core-purgatory-functionality.patch
kexec-load-and-relocate-purgatory-at-kernel-load-time.patch
kexec-bzimage64-support-for-loading-bzimage-using-64bit-entry.patch
kexec-support-for-kexec-on-panic-using-new-system-call.patch
kexec-support-kexec-kdump-on-efi-systems.patch
kexec-support-kexec-kdump-on-efi-systems-fix.patch
kexec-verify-the-signature-of-signed-pe-bzimage.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
