From: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
To: torvalds@linux-foundation.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 1/1] xen: asm/io.h should not include xen.h if XEN is disabled
Date: Wed, 3 Aug 2011 19:33:00 +0300 [thread overview]
Message-ID: <049cae3c2e2923ea7efbd205257e9e22b3df5e1a.1312388919.git.dmitry.kasatkin@intel.com> (raw)
kernel-devel package with kernel headers have no <include/xen> directory
if XEN is disabled. Modules which inclide asm/io.h won't compile.
XEN related content is behind the CONFIG_XEN flag in the io.h.
And <xen/xen.h> should be also behind CONFIG_XEN flag.
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
---
arch/x86/include/asm/io.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 0722730..ef26712 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -41,7 +41,9 @@
#include <asm-generic/int-ll64.h>
#include <asm/page.h>
+#ifdef CONFIG_XEN
#include <xen/xen.h>
+#endif
#define build_mmio_read(name, size, type, reg, barrier) \
static inline type name(const volatile void __iomem *addr) \
--
1.7.4.1
next reply other threads:[~2011-08-03 16:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-03 16:33 Dmitry Kasatkin [this message]
2011-08-04 1:04 ` Linus Torvalds
2011-08-04 9:48 ` Dmitry Kasatkin
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=049cae3c2e2923ea7efbd205257e9e22b3df5e1a.1312388919.git.dmitry.kasatkin@intel.com \
--to=dmitry.kasatkin@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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®