diff options
| author | Kyle McMartin <kyle@redhat.com> | 2009-02-14 04:11:29 -0500 |
|---|---|---|
| committer | Tony Luck <aegl@agluck-desktop.(none)> | 2009-02-25 14:40:27 -0500 |
| commit | 6b1ff036d4cde7834ef2f9dbea5747adaaac24e0 (patch) | |
| tree | 93c1703c46f06aac5408afb9ceb9418cea76f97b | |
| parent | c15d8a6499d04e5d2cac07f8120f207bb275f60f (diff) | |
[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>
| -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 | |||
| 638 | and include PCI device scope covered by these DMA | 638 | and include PCI device scope covered by these DMA |
| 639 | remapping devices. | 639 | remapping devices. |
| 640 | 640 | ||
| 641 | config DMAR_DEFAULT_ON | ||
| 642 | def_bool y | ||
| 643 | prompt "Enable DMA Remapping Devices by default" | ||
| 644 | depends on DMAR | ||
| 645 | help | ||
| 646 | Selecting this option will enable a DMAR device at boot time if | ||
| 647 | one is found. If this option is not selected, DMAR support can | ||
| 648 | be enabled by passing intel_iommu=on to the kernel. It is | ||
| 649 | recommended you say N here while the DMAR code remains | ||
| 650 | experimental. | ||
| 651 | |||
| 641 | endmenu | 652 | endmenu |
| 642 | 653 | ||
| 643 | endif | 654 | endif |
