UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: pci-dma.c declare iommu_bio_merge before they get used 

moved iommu_bio_merge from io_64.h to io.h because it is required for both.

Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
This commit is contained in:
Jaswinder Singh 2008-07-21 22:24:29 +05:30 committed by Ingo Molnar
parent a7b7511ac1
commit 9321b8cbbb
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-x86/io.h
View File

@ -73,6 +73,8 @@ build_mmio_write(__writeq, "q", unsigned long, "r", )
#define writeq writeq #define writeq writeq
#endif #endif
extern int iommu_bio_merge;
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "io_32.h" # include "io_32.h"
#else #else

1
include/asm-x86/io_64.h
View File

@ -233,7 +233,6 @@ void memset_io(volatile void __iomem *a, int b, size_t c);
#define flush_write_buffers() #define flush_write_buffers()
extern int iommu_bio_merge;
#define BIO_VMERGE_BOUNDARY iommu_bio_merge #define BIO_VMERGE_BOUNDARY iommu_bio_merge
/* /*