From: Yinghai Lu <Yinghai.Lu@Sun.COM>
To: Andi Kleen <ak@suse.de>, Andrew Morton <akpm@linux-foundation.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Muli Ben-Yehuda <muli@il.ibm.com>,
Vivek Goyal <vgoyal@in.ibm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH 2/2] x86_84: move iommu declaration from proto to iommu.h
Date: Mon, 25 Jun 2007 14:49:26 -0700 [thread overview]
Message-ID: <200706251449.27260.yinghai.lu@sun.com> (raw)
In-Reply-To: <200706251234.04548.yinghai.lu@sun.com>
[PATCH 2/2] x86_84: move iommu declaration from proto to iommu.h
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
arch/x86_64/kernel/aperture.c | 2 +-
arch/x86_64/kernel/early-quirks.c | 1 +
arch/x86_64/kernel/pci-dma.c | 2 +-
arch/x86_64/kernel/pci-gart.c | 1 +
arch/x86_64/kernel/pci-nommu.c | 2 +-
arch/x86_64/kernel/pci-swiotlb.c | 2 +-
arch/x86_64/kernel/reboot.c | 2 +-
include/asm-x86_64/iommu.h | 29 +++++++++++++++++++++++++++++
include/asm-x86_64/proto.h | 25 -------------------------
9 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c
index a3d450d..3b443c8 100644
--- a/arch/x86_64/kernel/aperture.c
+++ b/arch/x86_64/kernel/aperture.c
@@ -20,7 +20,7 @@
#include <linux/ioport.h>
#include <asm/e820.h>
#include <asm/io.h>
-#include <asm/proto.h>
+#include <asm/iommu.h>
#include <asm/pci-direct.h>
#include <asm/dma.h>
#include <asm/k8.h>
diff --git a/arch/x86_64/kernel/early-quirks.c b/arch/x86_64/kernel/early-quirks.c
index 990d9c2..13aa4fd 100644
--- a/arch/x86_64/kernel/early-quirks.c
+++ b/arch/x86_64/kernel/early-quirks.c
@@ -14,6 +14,7 @@
#include <linux/pci_ids.h>
#include <asm/pci-direct.h>
#include <asm/proto.h>
+#include <asm/iommu.h>
#include <asm/dma.h>
static void __init via_bugs(void)
diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c
index 9f80aad..46c1a57 100644
--- a/arch/x86_64/kernel/pci-dma.c
+++ b/arch/x86_64/kernel/pci-dma.c
@@ -8,7 +8,7 @@
#include <linux/pci.h>
#include <linux/module.h>
#include <asm/io.h>
-#include <asm/proto.h>
+#include <asm/iommu.h>
#include <asm/calgary.h>
int iommu_merge __read_mostly = 0;
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c
index ae091cd..6e44fc5 100644
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
@@ -28,6 +28,7 @@
#include <asm/mtrr.h>
#include <asm/pgtable.h>
#include <asm/proto.h>
+#include <asm/iommu.h>
#include <asm/cacheflush.h>
#include <asm/swiotlb.h>
#include <asm/dma.h>
diff --git a/arch/x86_64/kernel/pci-nommu.c b/arch/x86_64/kernel/pci-nommu.c
index 6dade0c..617949e 100644
--- a/arch/x86_64/kernel/pci-nommu.c
+++ b/arch/x86_64/kernel/pci-nommu.c
@@ -6,7 +6,7 @@
#include <linux/string.h>
#include <linux/dma-mapping.h>
-#include <asm/proto.h>
+#include <asm/iommu.h>
#include <asm/processor.h>
#include <asm/dma.h>
diff --git a/arch/x86_64/kernel/pci-swiotlb.c b/arch/x86_64/kernel/pci-swiotlb.c
index 4b4569a..b2f405e 100644
--- a/arch/x86_64/kernel/pci-swiotlb.c
+++ b/arch/x86_64/kernel/pci-swiotlb.c
@@ -5,7 +5,7 @@
#include <linux/module.h>
#include <linux/dma-mapping.h>
-#include <asm/proto.h>
+#include <asm/iommu.h>
#include <asm/swiotlb.h>
#include <asm/dma.h>
diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
index 7503068..368db2b 100644
--- a/arch/x86_64/kernel/reboot.c
+++ b/arch/x86_64/kernel/reboot.c
@@ -16,7 +16,7 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <asm/apic.h>
-#include <asm/proto.h>
+#include <asm/iommu.h>
/*
* Power off function, if any
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h
index b70aa0c..d6e3225 100644
--- a/include/asm-x86_64/proto.h
+++ b/include/asm-x86_64/proto.h
@@ -85,31 +85,6 @@ extern int exception_trace;
extern unsigned cpu_khz;
extern unsigned tsc_khz;
-extern void pci_iommu_shutdown(void);
-extern void no_iommu_init(void);
-extern int force_iommu, no_iommu;
-extern int iommu_detected;
-#ifdef CONFIG_IOMMU
-extern void gart_iommu_init(void);
-extern void gart_iommu_shutdown(void);
-extern void __init gart_parse_options(char *);
-extern void iommu_hole_init(void);
-extern int fallback_aper_order;
-extern int fallback_aper_force;
-extern int iommu_aperture;
-extern int iommu_aperture_allowed;
-extern int iommu_aperture_disabled;
-extern int fix_aperture;
-#else
-#define iommu_aperture 0
-#define iommu_aperture_allowed 0
-
-static inline void gart_iommu_shutdown(void)
-{
-}
-
-#endif
-
extern int reboot_force;
extern int notsc_setup(char *);
diff --git a/include/asm-x86_64/iommu.h b/include/asm-x86_64/iommu.h
new file mode 100644
index 0000000..5af471f
--- /dev/null
+++ b/include/asm-x86_64/iommu.h
@@ -0,0 +1,29 @@
+#ifndef _ASM_X8664_IOMMU_H
+#define _ASM_X8664_IOMMU_H 1
+
+extern void pci_iommu_shutdown(void);
+extern void no_iommu_init(void);
+extern int force_iommu, no_iommu;
+extern int iommu_detected;
+#ifdef CONFIG_IOMMU
+extern void gart_iommu_init(void);
+extern void gart_iommu_shutdown(void);
+extern void __init gart_parse_options(char *);
+extern void iommu_hole_init(void);
+extern int fallback_aper_order;
+extern int fallback_aper_force;
+extern int iommu_aperture;
+extern int iommu_aperture_allowed;
+extern int iommu_aperture_disabled;
+extern int fix_aperture;
+#else
+#define iommu_aperture 0
+#define iommu_aperture_allowed 0
+
+static inline void gart_iommu_shutdown(void)
+{
+}
+
+#endif
+
+#endif
next prev parent reply other threads:[~2007-06-25 21:48 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-22 19:19 [PATCH] x86-64: disable the GART before allocate aperture Yinghai Lu
2007-06-22 19:31 ` Muli Ben-Yehuda
2007-06-22 19:38 ` Yinghai Lu
2007-06-22 19:49 ` Yinghai Lu
2007-06-22 20:33 ` Alan Cox
2007-06-22 21:28 ` Andi Kleen
2007-06-22 21:38 ` Yinghai Lu
2007-06-22 21:41 ` Eric W. Biederman
2007-06-22 21:32 ` Eric W. Biederman
2007-06-22 21:45 ` Muli Ben-Yehuda
2007-06-22 21:59 ` Yinghai Lu
2007-06-22 22:19 ` Alan Cox
2007-06-22 22:32 ` Eric W. Biederman
2007-06-22 22:43 ` Yinghai Lu
2007-06-22 22:54 ` Alan Cox
2007-06-22 22:57 ` Yinghai Lu
2007-06-22 23:04 ` Alan Cox
2007-06-22 23:14 ` Eric W. Biederman
2007-06-23 0:14 ` Andi Kleen
2007-06-23 0:27 ` Yinghai Lu
2007-06-23 0:35 ` Muli Ben-Yehuda
2007-06-23 0:38 ` Andi Kleen
2007-06-23 2:34 ` [PATCH] x86-64: disable the GART in shutdown Yinghai Lu
2007-06-23 10:39 ` Muli Ben-Yehuda
2007-06-23 10:59 ` Andi Kleen
2007-06-23 11:09 ` Muli Ben-Yehuda
2007-06-23 11:08 ` Andi Kleen
2007-06-25 0:18 ` Yinghai Lu
2007-06-23 16:52 ` Andrew Morton
2007-06-25 0:22 ` Yinghai Lu
2007-06-25 2:10 ` Muli Ben-Yehuda
2007-06-25 19:34 ` [PATCH] x86-64: disable the GART in shutdown v2 Yinghai Lu
2007-06-25 19:41 ` Muli Ben-Yehuda
2007-06-25 19:52 ` Yinghai Lu
2007-06-25 19:56 ` Muli Ben-Yehuda
2007-06-25 21:48 ` [PATCH 1/2] x86-64: disable the GART in shutdown Yinghai Lu
2007-06-25 21:49 ` Yinghai Lu [this message]
2007-06-26 11:43 ` [PATCH 2/2] x86_84: move iommu declaration from proto to iommu.h Muli Ben-Yehuda
2007-06-23 9:08 ` [PATCH] x86-64: disable the GART before allocate aperture Alan Cox
2007-06-23 11:12 ` Vivek Goyal
2007-06-23 13:14 ` Andi Kleen
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=200706251449.27260.yinghai.lu@sun.com \
--to=yinghai.lu@sun.com \
--cc=ak@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=muli@il.ibm.com \
--cc=vgoyal@in.ibm.com \
/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;
as well as URLs for NNTP newsgroup(s).