git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
swiotlb.c
diff --git
a/arch/i386/kernel/swiotlb.c
b/arch/i386/kernel/swiotlb.c
index
733799b
..
7ae10ad
100644
(file)
--- a/
arch/i386/kernel/swiotlb.c
+++ b/
arch/i386/kernel/swiotlb.c
@@
-50,7
+50,7
@@
EXPORT_SYMBOL(swiotlb);
/* Width of DMA addresses in the IO TLB. 31 bits is an aacraid limitation. */
#define IO_TLB_DMA_BITS 31
/* Width of DMA addresses in the IO TLB. 31 bits is an aacraid limitation. */
#define IO_TLB_DMA_BITS 31
-
static
int swiotlb_force;
+int swiotlb_force;
static char *iotlb_virt_start;
static unsigned long iotlb_nslabs;
static char *iotlb_virt_start;
static unsigned long iotlb_nslabs;
@@
-199,7
+199,7
@@
swiotlb_init(void)
swiotlb = 1;
} else if ((swiotlb_force != -1) &&
is_running_on_xen() &&
swiotlb = 1;
} else if ((swiotlb_force != -1) &&
is_running_on_xen() &&
-
(xen_start_info->flags & SIF_INITDOMAIN
)) {
+
is_initial_xendomain(
)) {
/* Domain 0 always has a swiotlb. */
ram_end = HYPERVISOR_memory_op(XENMEM_maximum_ram_page, NULL);
if (ram_end <= 0x7ffff)
/* Domain 0 always has a swiotlb. */
ram_end = HYPERVISOR_memory_op(XENMEM_maximum_ram_page, NULL);
if (ram_end <= 0x7ffff)