Skip to contentSkip to conversation

x86/entry/64: Do not include inst.h in calling.h

PATCH Applied Uros Bizjak 2 participants 2 messages Aug 27, 2020 – Sep 4, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/entry/64: Do not include inst.h in calling.h

inst.h was included in calling.h solely to instantiate RDPID macro. The usage of RDPID was removed in commit 6a3ea3e68b8a8a.

Fixes 6a3ea3e68b8a8a ("x86/entry/64: Do not use RDPID in paranoid entry to accomodate KVM")
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
---
 arch/x86/entry/calling.h | 1 -
 1 file changed, 1 deletion(-)
arch/x86/entry/calling.h +0 -1
index ae9b0d4615b3..07a9331d55e7 100644
@@ -6,7 +6,6 @@
 #include <asm/percpu.h>
 #include <asm/asm-offsets.h>
 #include <asm/processor-flags.h>
-#include <asm/inst.h>
 
 /*
 
Signature · 1 line
2.26.2
merge bot Applied
#1 lore raw
The following commit has been merged into the x86/cleanups branch of tip:

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     eb3621798bcdd34ba480109bac357ba6a784d3e2
Gitweb:        https://git.kernel.org/tip/eb3621798bcdd34ba480109bac357ba6a784d3e2
Author:        Uros Bizjak <[email protected]>
AuthorDate:    Thu, 27 Aug 2020 19:17:35 +02:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Fri, 04 Sep 2020 10:59:21 +02:00

x86/entry/64: Do not include inst.h in calling.h

inst.h was included in calling.h solely to instantiate the RDPID macro. The usage of RDPID was removed in

6a3ea3e68b8a ("x86/entry/64: Do not use RDPID in paranoid entry to accomodate KVM")

so remove the include.

Fixes 6a3ea3e68b8a ("x86/entry/64: Do not use RDPID in paranoid entry to accomodate KVM")
---
 arch/x86/entry/calling.h | 1 -
 1 file changed, 1 deletion(-)
arch/x86/entry/calling.h +0 -1
index ae9b0d4..07a9331 100644
@@ -6,7 +6,6 @@
 #include <asm/percpu.h>
 #include <asm/asm-offsets.h>
 #include <asm/processor-flags.h>
-#include <asm/inst.h>
 
 /*