From: Juergen Gross <jgross@suse.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org
Cc: Juergen Gross <jgross@suse.com>,
Thomas Gleixner <tglx@kernel.org>, Ingo Molnar <mingo@redhat.com>,
Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>,
kernel test robot <lkp@intel.com>
Subject: [PATCH] x86/irqflags: Fix build failure
Date: Thu, 15 Jan 2026 17:10:14 +0100 [thread overview]
Message-ID: <20260115161015.362-1-jgross@suse.com> (raw)
When building with CONFIG_PARAVIRT, but without CONFIG_PARAVIRT_XXL,
a build failure might happen due to arch/x86/include/asm/irqflags.h
only including asm/paravirt.h when CONFIG_PARAVIRT_XXL is set.
This was spotted when testing a patch removing the
"#include <asm/paravirt.h>" from another header.
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>
---
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.51.0
next reply other threads:[~2026-01-15 16:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-15 16:10 Juergen Gross [this message]
2026-01-15 17:45 ` Borislav Petkov
2026-01-15 18:29 ` Jürgen Groß
2026-01-19 11:36 ` Borislav Petkov
2026-01-19 11:52 ` Jürgen Groß
2026-01-19 13:28 ` Borislav Petkov
2026-01-19 13:52 ` Jürgen Groß
2026-01-19 13:58 ` Jürgen Groß
2026-01-19 14:10 ` Borislav Petkov
2026-01-19 14:22 ` Jürgen Groß
2026-01-19 15:46 ` Borislav Petkov
2026-01-19 16:02 ` Jürgen Groß
2026-01-19 16:24 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260115161015.362-1-jgross@suse.com \
--to=jgross@suse.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@intel.com \
--cc=mingo@redhat.com \
--cc=tglx@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®