Commit 36c1eb95 authored by Juergen Gross's avatar Juergen Gross Committed by Ingo Molnar
Browse files

x86/irqflags: Preemptively move include paravirt.h directive where it belongs 

Commit

  22cc5ca5 ("x86/paravirt: Move halt paravirt calls under CONFIG_PARAVIRT")

moved some paravirt hooks from the CONFIG_PARAVIRT_XXL umbrella to
CONFIG_PARAVIRT, but missed to move the associated "#include <asm/paravirt.h>"
in irqflags.h from CONFIG_PARAVIRT_XXL to CONFIG_PARAVIRT.

This hasn't resulted in build failures yet, as all use cases of irqflags.h had
paravirt.h included via other header files, even without CONFIG_PARAVIRT_XXL
being set.

In order to allow changing those other header files, e.g. by no longer
including paravirt.h, fix irqflags.h by moving inclusion of paravirt.h under
the CONFIG_PARAVIRT umbrella.

  [ bp: Massage commit message. ]

Fixes: 22cc5ca5 ("x86/paravirt: Move halt paravirt calls under CONFIG_PARAVIRT")
Closes: https://lore.kernel.org/oe-kbuild-all/202601152203.plJOoOEF-lkp@intel.com/


Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://patch.msgid.link/20260119182632.596369-2-jgross@suse.com
parent 04e43ec9

arch/x86/include/asm/irqflags.h

+3 −3
Original line number Diff line number Diff line
@@ -96,11 +96,11 @@ static __always_inline void halt(void) 
	native_halt();

}

#endif /* __ASSEMBLER__ */

#else

#include <asm/paravirt.h>

#endif /* CONFIG_PARAVIRT */



#ifdef CONFIG_PARAVIRT_XXL

#include <asm/paravirt.h>

#else

#ifndef CONFIG_PARAVIRT_XXL

#ifndef __ASSEMBLER__

#include <linux/types.h>