[tip:core/iommu] x86: Fix iommu=nodac parameter handling

From: tip-bot for Tejun Heo
Date: Sun Nov 08 2009 - 08:08:42 EST


Commit-ID: 2ae8bb75db1f3de422eb5898f2a063c46c36dba8
Gitweb: http://git.kernel.org/tip/2ae8bb75db1f3de422eb5898f2a063c46c36dba8
Author: Tejun Heo <tj@xxxxxxxxxx>
AuthorDate: Mon, 26 Oct 2009 15:41:46 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sun, 8 Nov 2009 13:19:05 +0100

x86: Fix iommu=nodac parameter handling

iommu=nodac should forbid dac instead of enabling it. Fix it.

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Cc: Matteo Frigo <athena@xxxxxxxx>
Cc: <stable@xxxxxxxxxx> # .32.x and older
LKML-Reference: <4AE5B52A.4050408@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/kernel/pci-dma.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index ce2fb91..839d49a 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -216,7 +216,7 @@ static __init int iommu_setup(char *p)
if (!strncmp(p, "allowdac", 8))
forbid_dac = 0;
if (!strncmp(p, "nodac", 5))
- forbid_dac = -1;
+ forbid_dac = 1;
if (!strncmp(p, "usedac", 6)) {
forbid_dac = -1;
return 1;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/