From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755229AbbGUJku (ORCPT ); Tue, 21 Jul 2015 05:40:50 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40469 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754271AbbGUJkq (ORCPT ); Tue, 21 Jul 2015 05:40:46 -0400 Date: Tue, 21 Jul 2015 02:39:56 -0700 From: "tip-bot for Luis R. Rodriguez" Message-ID: Cc: torvalds@linux-foundation.org, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, dledford@redhat.com, hpa@zytor.com, mcgrof@suse.com, linux-kernel@vger.kernel.org Reply-To: peterz@infradead.org, torvalds@linux-foundation.org, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, dledford@redhat.com, hpa@zytor.com, mcgrof@suse.com In-Reply-To: <1437167245-28273-2-git-send-email-mcgrof@do-not-panic.com> References: <1437167245-28273-2-git-send-email-mcgrof@do-not-panic.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/mm/pat, drivers/infiniband/ipath: Replace WARN() with pr_warn() Git-Commit-ID: fd0a1b8607ef311a2c800dd54c9a4a3583756ea6 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Commit-ID: fd0a1b8607ef311a2c800dd54c9a4a3583756ea6 Gitweb: http://git.kernel.org/tip/fd0a1b8607ef311a2c800dd54c9a4a3583756ea6 Author: Luis R. Rodriguez AuthorDate: Fri, 17 Jul 2015 14:07:24 -0700 Committer: Ingo Molnar CommitDate: Tue, 21 Jul 2015 09:42:54 +0200 x86/mm/pat, drivers/infiniband/ipath: Replace WARN() with pr_warn() WARN() may confuse users, fix that. ipath_init_one() is part the device's probe so this would only be triggered if a corresponding device was found. Signed-off-by: Luis R. Rodriguez Acked-by: Doug Ledford Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: andy@silverblocksystems.net Cc: benh@kernel.crashing.org Cc: bp@suse.de Cc: dan.j.williams@intel.com Cc: jkosina@suse.cz Cc: julia.lawall@lip6.fr Cc: luto@amacapital.net Cc: mchehab@osg.samsung.com Link: http://lkml.kernel.org/r/1437167245-28273-2-git-send-email-mcgrof@do-not-panic.com Signed-off-by: Ingo Molnar --- drivers/infiniband/hw/ipath/ipath_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c index 2d7e503..871dbe5 100644 --- a/drivers/infiniband/hw/ipath/ipath_driver.c +++ b/drivers/infiniband/hw/ipath/ipath_driver.c @@ -31,6 +31,8 @@ * SOFTWARE. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include @@ -399,8 +401,8 @@ static int ipath_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) u32 bar0 = 0, bar1 = 0; #ifdef CONFIG_X86_64 - if (WARN(pat_enabled(), - "ipath needs PAT disabled, boot with nopat kernel parameter\n")) { + if (pat_enabled()) { + pr_warn("ipath needs PAT disabled, boot with nopat kernel parameter\n"); ret = -ENODEV; goto bail; }