diff options
| author | Kyle McMartin <kyle@redhat.com> | 2009-02-14 10:11:29 +0100 |
|---|---|---|
| committer | Tony Luck <aegl@agluck-desktop.(none)> | 2009-02-25 20:40:27 +0100 |
| commit | 6b1ff036d4cde7834ef2f9dbea5747adaaac24e0 (patch) | |
| tree | 93c1703c46f06aac5408afb9ceb9418cea76f97b /arch/ia64/Kconfig | |
| parent | Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff) | |
| download | linux-6b1ff036d4cde7834ef2f9dbea5747adaaac24e0.tar.xz linux-6b1ff036d4cde7834ef2f9dbea5747adaaac24e0.zip | |
[IA64] enable setting DMAR on by default
The previous commit which introduced the DMAR_DEFAULT_ON setting in
drivers/pci/dmar.c neglected to add the ability for ia64 to enable
the IOMMU by default. Rectify that mistake, doh!
Signed-off-by: Kyle McMartin <kyle@redhat.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 4eb45c012498..153e727a6e8e 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -638,6 +638,17 @@ config DMAR and include PCI device scope covered by these DMA remapping devices. +config DMAR_DEFAULT_ON + def_bool y + prompt "Enable DMA Remapping Devices by default" + depends on DMAR + help + Selecting this option will enable a DMAR device at boot time if + one is found. If this option is not selected, DMAR support can + be enabled by passing intel_iommu=on to the kernel. It is + recommended you say N here while the DMAR code remains + experimental. + endmenu endif |