Compare commits
No commits in common. "factory" and "devel" have entirely different histories.
88
fix-building-on-x86_64-with-binutils-2.41.patch
Normal file
88
fix-building-on-x86_64-with-binutils-2.41.patch
Normal file
@ -0,0 +1,88 @@
|
||||
From: Michel Lind <salimma@fedoraproject.org>
|
||||
Subject: Fix building on x86_64 with binutils 2.41
|
||||
Git-commit: 328de8e00e298f00d7ba6b25dc3950147e9642e6
|
||||
Patch-mainline:
|
||||
References:
|
||||
Acked-by: Jiri Bohac <jbohac@suse.cz>
|
||||
|
||||
Newer versions of the GNU assembler (observed with binutils 2.41) will
|
||||
complain about the ".arch i386" in files assembled with "as --64",
|
||||
with the message "Error: 64bit mode not supported on 'i386'".
|
||||
|
||||
Fix by moving ".arch i386" below the relevant ".code32" directive, so
|
||||
that the assembler is no longer expecting 64-bit instructions to be used
|
||||
by the time that the ".arch i386" directive is encountered.
|
||||
|
||||
Based on similar iPXE fix:
|
||||
https://github.com/ipxe/ipxe/commit/6ca597eee
|
||||
|
||||
Signed-off-by: Michel Lind <michel@michel-slm.name>
|
||||
Signed-off-by: Simon Horman <horms@kernel.org>
|
||||
|
||||
diff --git a/purgatory/arch/i386/entry32-16-debug.S b/purgatory/arch/i386/entry32-16-debug.S
|
||||
index 5167944..12e1164 100644
|
||||
--- a/purgatory/arch/i386/entry32-16-debug.S
|
||||
+++ b/purgatory/arch/i386/entry32-16-debug.S
|
||||
@@ -25,10 +25,10 @@
|
||||
.globl entry16_debug_pre32
|
||||
.globl entry16_debug_first32
|
||||
.globl entry16_debug_old_first32
|
||||
- .arch i386
|
||||
.balign 16
|
||||
entry16_debug:
|
||||
.code32
|
||||
+ .arch i386
|
||||
/* Compute where I am running at (assumes esp valid) */
|
||||
call 1f
|
||||
1: popl %ebx
|
||||
diff --git a/purgatory/arch/i386/entry32-16.S b/purgatory/arch/i386/entry32-16.S
|
||||
index c051aab..eace095 100644
|
||||
--- a/purgatory/arch/i386/entry32-16.S
|
||||
+++ b/purgatory/arch/i386/entry32-16.S
|
||||
@@ -20,10 +20,10 @@
|
||||
#undef i386
|
||||
.text
|
||||
.globl entry16, entry16_regs
|
||||
- .arch i386
|
||||
.balign 16
|
||||
entry16:
|
||||
.code32
|
||||
+ .arch i386
|
||||
/* Compute where I am running at (assumes esp valid) */
|
||||
call 1f
|
||||
1: popl %ebx
|
||||
diff --git a/purgatory/arch/i386/entry32.S b/purgatory/arch/i386/entry32.S
|
||||
index f7a494f..8ce9e31 100644
|
||||
--- a/purgatory/arch/i386/entry32.S
|
||||
+++ b/purgatory/arch/i386/entry32.S
|
||||
@@ -20,10 +20,10 @@
|
||||
#undef i386
|
||||
|
||||
.text
|
||||
- .arch i386
|
||||
.globl entry32, entry32_regs
|
||||
entry32:
|
||||
.code32
|
||||
+ .arch i386
|
||||
|
||||
/* Setup a gdt that should that is generally usefully */
|
||||
lgdt %cs:gdt
|
||||
diff --git a/purgatory/arch/i386/setup-x86.S b/purgatory/arch/i386/setup-x86.S
|
||||
index 201bb2c..a212eed 100644
|
||||
--- a/purgatory/arch/i386/setup-x86.S
|
||||
+++ b/purgatory/arch/i386/setup-x86.S
|
||||
@@ -21,10 +21,10 @@
|
||||
#undef i386
|
||||
|
||||
.text
|
||||
- .arch i386
|
||||
.globl purgatory_start
|
||||
purgatory_start:
|
||||
.code32
|
||||
+ .arch i386
|
||||
|
||||
/* Load a gdt so I know what the segment registers are */
|
||||
lgdt %cs:gdt
|
||||
--
|
||||
2.43.0
|
||||
|
59
kexec-dont-use-kexec_file_load-on-xen.patch
Normal file
59
kexec-dont-use-kexec_file_load-on-xen.patch
Normal file
@ -0,0 +1,59 @@
|
||||
From: Jiri Bohac <jbohac@suse.cz>
|
||||
Subject: [PATCH] kexec: dont use kexec_file_load on XEN
|
||||
Patch-mainline: 94fbe64fb22d61726ca0c0996987574b6c783c19
|
||||
References: bsc#1218590
|
||||
|
||||
Since commit 29fe5067ed07 ("kexec: make -a the default")
|
||||
kexec tries the kexec_file_load syscall first and only falls back to kexec_load on
|
||||
selected error codes.
|
||||
|
||||
This effectively breaks kexec on XEN, unless -c is pecified to force the kexec_load
|
||||
syscall.
|
||||
|
||||
The XEN-specific functions (xen_kexec_load / xen_kexec_unload) are only called
|
||||
from my_load / k_unload, i.e. the kexec_load code path.
|
||||
|
||||
With -p (panic kernel) kexec_file_load on XEN fails with -EADDRNOTAVAIL (crash
|
||||
kernel reservation is ignored by the kernel on XEN), which is not in the list
|
||||
of return codes that cause the fallback to kexec_file.
|
||||
|
||||
Without -p kexec_file_load actualy leads to a kernel oops on v6.4.0
|
||||
(needs to be dubugged separately).
|
||||
|
||||
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
|
||||
Fixes: 29fe5067ed07 ("kexec: make -a the default")
|
||||
---
|
||||
kexec/kexec.8 | 1 +
|
||||
kexec/kexec.c | 4 ++++
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/kexec/kexec.8 b/kexec/kexec.8
|
||||
index b969cea..9e995fe 100644
|
||||
--- a/kexec/kexec.8
|
||||
+++ b/kexec/kexec.8
|
||||
@@ -162,6 +162,7 @@ Specify that the new kernel is of this
|
||||
.TP
|
||||
.BI \-s\ (\-\-kexec-file-syscall)
|
||||
Specify that the new KEXEC_FILE_LOAD syscall should be used exclusively.
|
||||
+Ignored on XEN.
|
||||
.TP
|
||||
.BI \-c\ (\-\-kexec-syscall)
|
||||
Specify that the old KEXEC_LOAD syscall should be used exclusively.
|
||||
diff --git a/kexec/kexec.c b/kexec/kexec.c
|
||||
index 08edfca..9d0ec46 100644
|
||||
--- a/kexec/kexec.c
|
||||
+++ b/kexec/kexec.c
|
||||
@@ -1685,6 +1685,10 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
}
|
||||
+ if (xen_present()) {
|
||||
+ do_kexec_file_syscall = 0;
|
||||
+ do_kexec_fallback = 0;
|
||||
+ }
|
||||
if (do_kexec_file_syscall) {
|
||||
if (do_load_jump_back_helper && !do_kexec_fallback)
|
||||
die("--load-jump-back-helper not supported with kexec_file_load\n");
|
||||
--
|
||||
2.43.0
|
||||
|
BIN
kexec-tools-2.0.28.tar.sign
Normal file
BIN
kexec-tools-2.0.28.tar.sign
Normal file
Binary file not shown.
3
kexec-tools-2.0.28.tar.xz
Normal file
3
kexec-tools-2.0.28.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d2f0ef872f39e2fe4b1b01feb62b0001383207239b9f8041f98a95564161d053
|
||||
size 312524
|
BIN
kexec-tools-2.0.29.tar.sign
Normal file
BIN
kexec-tools-2.0.29.tar.sign
Normal file
Binary file not shown.
BIN
kexec-tools-2.0.29.tar.xz
(Stored with Git LFS)
Normal file
BIN
kexec-tools-2.0.29.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user