| Message ID | 20230206124251.911744-3-burzalodowa@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remove unnecessary asm/hvm/support.h includes | expand |
On 06.02.2023 13:42, Xenia Ragiadakou wrote: > Since none of the declarations and macro definitions in asm/hvm/support.h is > referred in x86/cpu/hygon.c, remove the unnecessary include. > > To resolve the subsequent build error for implicit declaration of wrmsrl() > and rdmsrl() triggered in asm/spec_ctrl.h, replace asm/msr-index.h with > asm/msr.h in asm/spec_ctrl.h's included headers. > > No functional change intended. > > Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Acked-by: Jan Beulich <jbeulich@suse.com>
diff --git a/xen/arch/x86/cpu/hygon.c b/xen/arch/x86/cpu/hygon.c index 361eb6fd41..42029f2145 100644 --- a/xen/arch/x86/cpu/hygon.c +++ b/xen/arch/x86/cpu/hygon.c @@ -1,6 +1,5 @@ #include <xen/init.h> #include <asm/processor.h> -#include <asm/hvm/support.h> #include <asm/spec_ctrl.h> #include "cpu.h" diff --git a/xen/arch/x86/include/asm/spec_ctrl.h b/xen/arch/x86/include/asm/spec_ctrl.h index 6a77c39378..e928596450 100644 --- a/xen/arch/x86/include/asm/spec_ctrl.h +++ b/xen/arch/x86/include/asm/spec_ctrl.h @@ -60,7 +60,7 @@ #include <asm/alternative.h> #include <asm/current.h> -#include <asm/msr-index.h> +#include <asm/msr.h> void init_speculation_mitigations(void); void spec_ctrl_init_domain(struct domain *d);
Since none of the declarations and macro definitions in asm/hvm/support.h is referred in x86/cpu/hygon.c, remove the unnecessary include. To resolve the subsequent build error for implicit declaration of wrmsrl() and rdmsrl() triggered in asm/spec_ctrl.h, replace asm/msr-index.h with asm/msr.h in asm/spec_ctrl.h's included headers. No functional change intended. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> --- xen/arch/x86/cpu/hygon.c | 1 - xen/arch/x86/include/asm/spec_ctrl.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)