From 680e15d5b92daa7b6aa65b4fffee26414175533b Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 20 Mar 2024 18:42:51 -0400 Subject: [PATCH] Fixes for 5.10 Signed-off-by: Sasha Levin --- queue-5.10/series | 1 + ...-build-due-to-__text_gen_insn-backpo.patch | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 queue-5.10/x86-paravirt-fix-build-due-to-__text_gen_insn-backpo.patch diff --git a/queue-5.10/series b/queue-5.10/series index 9738ea56029..50963031044 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -25,3 +25,4 @@ input-gpio_keys_polled-suppress-deferred-probe-error.patch asoc-wm8962-enable-oscillator-if-selecting-wm8962_fl.patch asoc-wm8962-enable-both-spkoutr_ena-and-spkoutl_ena-.patch asoc-wm8962-fix-up-incorrect-error-message-in-wm8962.patch +x86-paravirt-fix-build-due-to-__text_gen_insn-backpo.patch diff --git a/queue-5.10/x86-paravirt-fix-build-due-to-__text_gen_insn-backpo.patch b/queue-5.10/x86-paravirt-fix-build-due-to-__text_gen_insn-backpo.patch new file mode 100644 index 00000000000..e03712dc04b --- /dev/null +++ b/queue-5.10/x86-paravirt-fix-build-due-to-__text_gen_insn-backpo.patch @@ -0,0 +1,42 @@ +From 595dc01837c4a464219763d9ecaa8c5d0df3a51d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 20 Mar 2024 12:03:16 -0400 +Subject: x86/paravirt: Fix build due to __text_gen_insn() backport + +From: Borislav Petkov (AMD) + +The Link tag has all the details but basically due to missing upstream +commits, the header which contains __text_gen_insn() is not in the +includes in paravirt.c, leading to: + + arch/x86/kernel/paravirt.c: In function 'paravirt_patch_call': + arch/x86/kernel/paravirt.c:65:9: error: implicit declaration of function '__text_gen_insn' \ + [-Werror=implicit-function-declaration] + 65 | __text_gen_insn(insn_buff, CALL_INSN_OPCODE, + | ^~~~~~~~~~~~~~~ + +Add the missing include. + +Reported-by: Omar Sandoval +Signed-off-by: Borislav Petkov (AMD) +Link: https://lore.kernel.org/r/ZeYXvd1-rVkPGvvW@telecaster +Signed-off-by: Sasha Levin +--- + arch/x86/kernel/paravirt.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c +index 5bea8d93883a2..f0e4ad8595ca7 100644 +--- a/arch/x86/kernel/paravirt.c ++++ b/arch/x86/kernel/paravirt.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + /* + * nop stub, which must not clobber anything *including the stack* to +-- +2.43.0 + -- 2.47.2