diff options
| author | Jeremy Cline <jcline@redhat.com> | 2020-02-04 17:49:56 -0500 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2020-02-04 17:49:56 -0500 |
| commit | 3e71a5ae30d7a271d63a9bd92fb2e84b9e75605d (patch) | |
| tree | 68d4b43a5d92d65e1b849910304792f986b16287 | |
| parent | 8ced7a7bf5454ba1e020a3ea643848101c7f3b02 (diff) | |
| download | kernel-3e71a5ae30d7a271d63a9bd92fb2e84b9e75605d.tar.gz kernel-3e71a5ae30d7a271d63a9bd92fb2e84b9e75605d.tar.xz kernel-3e71a5ae30d7a271d63a9bd92fb2e84b9e75605d.zip | |
A quick fix for the armv7hl build failure.
The build is failing because of an undefined symbol. This needs further
investigation since I have no idea why this worked before, but this will
at least let us produce a Rawhide kernel that boots.
| -rw-r--r-- | 0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch | 28 | ||||
| -rw-r--r-- | kernel.spec | 2 |
2 files changed, 30 insertions, 0 deletions
diff --git a/0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch b/0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch new file mode 100644 index 000000000..9d2694b32 --- /dev/null +++ b/0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch @@ -0,0 +1,28 @@ +From 3f16f4a34eeb22d70afe1bebdd2cfcded179f22a Mon Sep 17 00:00:00 2001 +From: Jeremy Cline <jcline@redhat.com> +Date: Tue, 4 Feb 2020 15:31:19 -0500 +Subject: [PATCH] Include kvm_asm.h and kvm_arm.h in kvm/arm/trace.h + +commit 0e20f5e25556 maybe broke this. + +Signed-off-by: Jeremy Cline <jcline@redhat.com> +--- + virt/kvm/arm/trace.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/virt/kvm/arm/trace.h b/virt/kvm/arm/trace.h +index 204d210d01c2..1c88e60a6b00 100644 +--- a/virt/kvm/arm/trace.h ++++ b/virt/kvm/arm/trace.h +@@ -4,6 +4,8 @@ + + #include <kvm/arm_arch_timer.h> + #include <linux/tracepoint.h> ++#include <asm/kvm_asm.h> ++#include <asm/kvm_arm.h> + + #undef TRACE_SYSTEM + #define TRACE_SYSTEM kvm +-- +2.24.1 + diff --git a/kernel.spec b/kernel.spec index c0ee505f2..67af5a6c3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -860,6 +860,8 @@ Patch505: ARM-fix-__get_user_check-in-case-uaccess_-calls-are-not-inlined.patch # GCC 10 build fix for x86_64 Patch528: 0001-x86-Don-t-declare-__force_order-in-kaslr_64.c.patch +Patch529: 0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch + # END OF PATCH DEFINITIONS %endif |