Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2cf8e08 authored by Yinghai Lu's avatar Yinghai Lu Committed by Linus Torvalds
Browse files

x86_64: move iommu declaration from proto to iommu.h 



[akpm@linux-foundation.org: build fix]
Signed-off-by: default avatarYinghai Lu <yinghai.lu@sun.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: Dave Jones <davej@codemonkey.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1c05f093

arch/x86_64/kernel/aperture.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/x86_64/kernel/early-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

arch/x86_64/kernel/pci-calgary.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <linux/pci_ids.h>

#include <linux/pci.h>

#include <linux/delay.h>

#include <asm/proto.h>

#include <asm/iommu.h>

#include <asm/calgary.h>

#include <asm/tce.h>

#include <asm/pci-direct.h>

arch/x86_64/kernel/pci-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/x86_64/kernel/pci-gart.c

+1 −0
Original line number Diff line number Diff line
@@ -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>