git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
[pandora-kernel.git]
/
drivers
/
pci
/
dmar.c
diff --git
a/drivers/pci/dmar.c
b/drivers/pci/dmar.c
index
3de3a43
..
0157708
100644
(file)
--- a/
drivers/pci/dmar.c
+++ b/
drivers/pci/dmar.c
@@
-36,6
+36,7
@@
#include <linux/tboot.h>
#include <linux/dmi.h>
#include <linux/slab.h>
#include <linux/tboot.h>
#include <linux/dmi.h>
#include <linux/slab.h>
+#include <asm/iommu_table.h>
#define PREFIX "DMAR: "
#define PREFIX "DMAR: "
@@
-687,7
+688,7
@@
failed:
return 0;
}
return 0;
}
-
void
__init detect_intel_iommu(void)
+
int
__init detect_intel_iommu(void)
{
int ret;
{
int ret;
@@
-723,6
+724,8
@@
void __init detect_intel_iommu(void)
}
early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
dmar_tbl = NULL;
}
early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
dmar_tbl = NULL;
+
+ return ret ? 1 : -ENODEV;
}
}
@@
-1455,3
+1458,4
@@
int __init dmar_ir_support(void)
return 0;
return dmar->flags & 0x1;
}
return 0;
return dmar->flags & 0x1;
}
+IOMMU_INIT_POST(detect_intel_iommu);