-
Notifications
You must be signed in to change notification settings - Fork 19.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
x86: fix build on kernel 5.10.211 (#11972)
- Loading branch information
1 parent
a4bb24a
commit bc21d2c
Showing
1 changed file
with
40 additions
and
0 deletions.
There are no files selected for viewing
40 changes: 40 additions & 0 deletions
40
target/linux/x86/patches-5.10/020-x86-Fix-compile-problem.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Hauke Mehrtens <[email protected]> | ||
Date: Sun, 3 Mar 2024 19:57:11 +0100 | ||
Subject: x86: Fix compile problem | ||
|
||
This fixes the following compile problem: | ||
CC arch/x86/kernel/paravirt.o | ||
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, | ||
| ^~~~~~~~~~~~~~~ | ||
arch/x86/kernel/paravirt.c:65:36: error: 'CALL_INSN_OPCODE' undeclared (first use in this function) | ||
65 | __text_gen_insn(insn_buff, CALL_INSN_OPCODE, | ||
| ^~~~~~~~~~~~~~~~ | ||
arch/x86/kernel/paravirt.c:65:36: note: each undeclared identifier is reported only once for each function it appears in | ||
arch/x86/kernel/paravirt.c:66:47: error: 'CALL_INSN_SIZE' undeclared (first use in this function) | ||
66 | (void *)addr, target, CALL_INSN_SIZE); | ||
| ^~~~~~~~~~~~~~ | ||
arch/x86/kernel/paravirt.c:68:1: error: control reaches end of non-void function [-Werror=return-type] | ||
68 | } | ||
| ^ | ||
cc1: some warnings being treated as errors | ||
make[7]: *** [scripts/Makefile.build:286: arch/x86/kernel/paravirt.o] Error 1 | ||
|
||
Fixes: b253061d4b86 ("x86/ibt,paravirt: Use text_gen_insn() for paravirt_patch()") | ||
Signed-off-by: Hauke Mehrtens <[email protected]> | ||
--- | ||
arch/x86/kernel/paravirt.c | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
--- a/arch/x86/kernel/paravirt.c | ||
+++ b/arch/x86/kernel/paravirt.c | ||
@@ -14,6 +14,7 @@ | ||
#include <linux/highmem.h> | ||
#include <linux/kprobes.h> | ||
#include <linux/pgtable.h> | ||
+#include <linux/static_call.h> | ||
|
||
#include <asm/bug.h> | ||
#include <asm/paravirt.h> |