x86: don't include xen/xen.h in <asm/io.h> unless XEN is enabled
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2011 08:00:38 +0000 (22:00 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2011 08:00:38 +0000 (22:00 -1000)
commit33f35f2a4ee3abfc0f87990058aa1b6b5092f725
tree8433c0f91fc9d10662965f0e9c7d49c7a9d52580
parent0ea648441a189f6e3e90a25c74511738799a0c7a
x86: don't include xen/xen.h in <asm/io.h> unless XEN is enabled

Dmitry Kasatkin reports:
  "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."

So move the include of <xen/xen.h> down into the section that is
conditional on CONFIG_XEN.

Reported-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/include/asm/io.h