From 13ba7fad57d9a9ad0576c1fd701f1dd4cd55a8f9 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Thu, 10 Jul 2008 08:27:49 +0900
Subject: [PATCH] --- yaml --- r: 100092 b: refs/heads/master c:
 e93be88d7ec9d183c1cca51eabe040c051cdb687 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/include/asm-x86/gart.h  | 34 ++++------------------------------
 trunk/include/asm-x86/iommu.h | 29 +++++++++++++++++------------
 3 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/[refs] b/[refs]
index a888ffba05ce..7d95000fb65f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 849567b9363dc8b90c369fff8acc245a1b47d94d
+refs/heads/master: e93be88d7ec9d183c1cca51eabe040c051cdb687
diff --git a/trunk/include/asm-x86/gart.h b/trunk/include/asm-x86/gart.h
index 417f76ea677b..33b9aeeb35a2 100644
--- a/trunk/include/asm-x86/gart.h
+++ b/trunk/include/asm-x86/gart.h
@@ -1,40 +1,14 @@
-#ifndef _ASM_X8664_IOMMU_H
-#define _ASM_X8664_IOMMU_H 1
+#ifndef _ASM_X8664_GART_H
+#define _ASM_X8664_GART_H 1
 
 #include <asm/e820.h>
+#include <asm/iommu.h>
 
-extern void pci_iommu_shutdown(void);
-extern void no_iommu_init(void);
-extern int force_iommu, no_iommu;
-extern int iommu_detected;
-extern int agp_amd64_init(void);
-#ifdef CONFIG_GART_IOMMU
-extern void gart_iommu_init(void);
-extern void gart_iommu_shutdown(void);
-extern void __init gart_parse_options(char *);
-extern void early_gart_iommu_check(void);
-extern void gart_iommu_hole_init(void);
 extern void set_up_gart_resume(u32, u32);
+
 extern int fallback_aper_order;
 extern int fallback_aper_force;
-extern int gart_iommu_aperture;
-extern int gart_iommu_aperture_allowed;
-extern int gart_iommu_aperture_disabled;
 extern int fix_aperture;
-#else
-#define gart_iommu_aperture		0
-#define gart_iommu_aperture_allowed	0
-#define gart_iommu_aperture_disabled	1
-
-static inline void early_gart_iommu_check(void)
-{
-}
-
-static inline void gart_iommu_shutdown(void)
-{
-}
-
-#endif
 
 /* PTE bits. */
 #define GPTE_VALID	1
diff --git a/trunk/include/asm-x86/iommu.h b/trunk/include/asm-x86/iommu.h
index cb7e9891bfd2..068c9a40aa5b 100644
--- a/trunk/include/asm-x86/iommu.h
+++ b/trunk/include/asm-x86/iommu.h
@@ -1,29 +1,34 @@
-#ifndef _ASM_X8664_GART_H
-#define _ASM_X8664_GART_H 1
+#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_GART_IOMMU
+extern int gart_iommu_aperture;
+extern int gart_iommu_aperture_allowed;
+extern int gart_iommu_aperture_disabled;
+
+extern void early_gart_iommu_check(void);
 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;
+extern void gart_iommu_hole_init(void);
+
 #else
-#define iommu_aperture 0
-#define iommu_aperture_allowed 0
+#define gart_iommu_aperture            0
+#define gart_iommu_aperture_allowed    0
+#define gart_iommu_aperture_disabled   1
 
-static inline void gart_iommu_shutdown(void)
+static inline void early_gart_iommu_check(void)
 {
 }
 
+static inline void gart_iommu_shutdown(void)
+{
+}
 #endif
 
 #endif