Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753546AbZKHNIc (ORCPT ); Sun, 8 Nov 2009 08:08:32 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751735AbZKHNIa (ORCPT ); Sun, 8 Nov 2009 08:08:30 -0500 Received: from hera.kernel.org ([140.211.167.34]:59207 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753112AbZKHNI2 (ORCPT ); Sun, 8 Nov 2009 08:08:28 -0500 Date: Sun, 8 Nov 2009 13:07:40 GMT From: tip-bot for Tejun Heo Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, athena@fftw.org, fujita.tomonori@lab.ntt.co.jp, tj@kernel.org, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, fujita.tomonori@lab.ntt.co.jp, athena@fftw.org, tj@kernel.org, tglx@linutronix.de, mingo@elte.hu In-Reply-To: <4AE5B52A.4050408@kernel.org> References: <4AE5B52A.4050408@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:core/iommu] x86: Fix iommu=nodac parameter handling Message-ID: Git-Commit-ID: 2ae8bb75db1f3de422eb5898f2a063c46c36dba8 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1422 Lines: 39 Commit-ID: 2ae8bb75db1f3de422eb5898f2a063c46c36dba8 Gitweb: http://git.kernel.org/tip/2ae8bb75db1f3de422eb5898f2a063c46c36dba8 Author: Tejun Heo AuthorDate: Mon, 26 Oct 2009 15:41:46 +0100 Committer: Ingo Molnar 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 Acked-by: FUJITA Tomonori Cc: Matteo Frigo Cc: # .32.x and older LKML-Reference: <4AE5B52A.4050408@kernel.org> Signed-off-by: Ingo Molnar --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/