Commit 22cc5ca5de52 ("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.

Fixes: 22cc5ca5de52 ("x86/paravirt: Move halt paravirt calls under CONFIG_PARAVIRT")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202601152203.plJOoOEF-lkp@intel.com/
Signed-off-by: Juergen Gross <jgross@suse.com>
---
V4:
- merge into slow_io series as prereq patch (Boris Petkov)
- rewrite commit message (Boris Petkov)
---
 arch/x86/include/asm/irqflags.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
index a1193e9d65f2..4d4d02e31287 100644
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -96,11 +96,11 @@ static __always_inline void halt(void)
 	native_halt();
 }
 #endif /* __ASSEMBLY__ */
+#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>
 
-- 
2.52.0