The patch titled
x86_84: move iommu declaration from proto to iommu.h
has been added to the -mm tree. Its filename is
x86_84-move-iommu-declaration-from-proto-to-iommuh.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86_84: move iommu declaration from proto to iommu.h
From: Yinghai Lu <Yinghai.Lu@xxxxxxx>
Signed-off-by: Yinghai Lu <yinghai.lu@xxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: Muli Ben-Yehuda <muli@xxxxxxxxxx>
Cc: Vivek Goyal <vgoyal@xxxxxxxxxx>
Cc: Dave Jones <davej@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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 -puN arch/x86_64/kernel/aperture.c~x86_84-move-iommu-declaration-from-proto-to-iommuh arch/x86_64/kernel/aperture.c
--- a/arch/x86_64/kernel/aperture.c~x86_84-move-iommu-declaration-from-proto-to-iommuh
+++ a/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 -puN arch/x86_64/kernel/early-quirks.c~x86_84-move-iommu-declaration-from-proto-to-iommuh arch/x86_64/kernel/early-quirks.c
--- a/arch/x86_64/kernel/early-quirks.c~x86_84-move-iommu-declaration-from-proto-to-iommuh
+++ a/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 -puN arch/x86_64/kernel/pci-dma.c~x86_84-move-iommu-declaration-from-proto-to-iommuh arch/x86_64/kernel/pci-dma.c
--- a/arch/x86_64/kernel/pci-dma.c~x86_84-move-iommu-declaration-from-proto-to-iommuh
+++ a/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 -puN arch/x86_64/kernel/pci-gart.c~x86_84-move-iommu-declaration-from-proto-to-iommuh arch/x86_64/kernel/pci-gart.c
--- a/arch/x86_64/kernel/pci-gart.c~x86_84-move-iommu-declaration-from-proto-to-iommuh
+++ a/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 -puN arch/x86_64/kernel/pci-nommu.c~x86_84-move-iommu-declaration-from-proto-to-iommuh arch/x86_64/kernel/pci-nommu.c
--- a/arch/x86_64/kernel/pci-nommu.c~x86_84-move-iommu-declaration-from-proto-to-iommuh
+++ a/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 -puN arch/x86_64/kernel/pci-swiotlb.c~x86_84-move-iommu-declaration-from-proto-to-iommuh arch/x86_64/kernel/pci-swiotlb.c
--- a/arch/x86_64/kernel/pci-swiotlb.c~x86_84-move-iommu-declaration-from-proto-to-iommuh
+++ a/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 -puN arch/x86_64/kernel/reboot.c~x86_84-move-iommu-declaration-from-proto-to-iommuh arch/x86_64/kernel/reboot.c
--- a/arch/x86_64/kernel/reboot.c~x86_84-move-iommu-declaration-from-proto-to-iommuh
+++ a/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 -puN /dev/null include/asm-x86_64/iommu.h
--- /dev/null
+++ a/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
diff -puN include/asm-x86_64/proto.h~x86_84-move-iommu-declaration-from-proto-to-iommuh include/asm-x86_64/proto.h
--- a/include/asm-x86_64/proto.h~x86_84-move-iommu-declaration-from-proto-to-iommuh
+++ a/include/asm-x86_64/proto.h
@@ -83,31 +83,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 *);
_
Patches currently in -mm which might be from Yinghai.Lu@xxxxxxx are
serial-assert-dtr-for-serial-console-devices.patch
x86-64-disable-the-gart-in-shutdown.patch
x86_84-move-iommu-declaration-from-proto-to-iommuh.patch
console-more-buf-for-index-parsing.patch
console-console-handover-to-preferred-console.patch
serial-convert-early_uart-to-earlycon-for-8250.patch
serial-convert-early_uart-to-earlycon-for-8250-fix.patch
serial-convert-early_uart-to-earlycon-for-8250-ia64-fix.patch
serial-convert-early_uart-to-earlycon-for-8250-fix-3-alias.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
