[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-2ae8bb75db1f3de422eb5898f2a063c46c36dba8@git.kernel.org>
Date: Sun, 8 Nov 2009 13:07:40 GMT
From: tip-bot for Tejun Heo <tj@...nel.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
athena@...w.org, fujita.tomonori@....ntt.co.jp, tj@...nel.org,
tglx@...utronix.de, mingo@...e.hu
Subject: [tip:core/iommu] x86: Fix iommu=nodac parameter handling
Commit-ID: 2ae8bb75db1f3de422eb5898f2a063c46c36dba8
Gitweb: http://git.kernel.org/tip/2ae8bb75db1f3de422eb5898f2a063c46c36dba8
Author: Tejun Heo <tj@...nel.org>
AuthorDate: Mon, 26 Oct 2009 15:41:46 +0100
Committer: Ingo Molnar <mingo@...e.hu>
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@...nel.org>
Acked-by: FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>
Cc: Matteo Frigo <athena@...w.org>
Cc: <stable@...nel.org> # .32.x and older
LKML-Reference: <4AE5B52A.4050408@...nel.org>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists