linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "tip-bot for Luis R. Rodriguez" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:x86/urgent] x86/mm/pat, drivers/infiniband/ipath: Replace WARN() with pr_warn()
Date: Tue, 21 Jul 2015 02:39:56 -0700	[thread overview]
Message-ID: <tip-fd0a1b8607ef311a2c800dd54c9a4a3583756ea6@git.kernel.org> (raw)
In-Reply-To: <1437167245-28273-2-git-send-email-mcgrof@do-not-panic.com>

Commit-ID:  fd0a1b8607ef311a2c800dd54c9a4a3583756ea6
Gitweb:     http://git.kernel.org/tip/fd0a1b8607ef311a2c800dd54c9a4a3583756ea6
Author:     Luis R. Rodriguez <mcgrof@suse.com>
AuthorDate: Fri, 17 Jul 2015 14:07:24 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
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 <mcgrof@suse.com>
Acked-by: Doug Ledford <dledford@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
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 <mingo@kernel.org>
---
 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 <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/idr.h>
@@ -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;
 	}

  parent reply	other threads:[~2015-07-21  9:40 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-17 21:07 [RESEND PATCH v2 0/2] x86/mm/pat: modify nopat requirement warning Luis R. Rodriguez
2015-07-17 21:07 ` [RESEND PATCH v2 1/2] x86/mm/pat, drivers/infiniband/ipath: replace WARN() with pr_warn() Luis R. Rodriguez
2015-07-20 18:08   ` Doug Ledford
2015-07-21  9:39   ` tip-bot for Luis R. Rodriguez [this message]
2015-07-17 21:07 ` [RESEND PATCH v2 2/2] x86/mm/pat, drivers/media/ivtv: move pat warn and " Luis R. Rodriguez
2015-07-21  9:40   ` [tip:x86/urgent] x86/mm/pat, drivers/media/ivtv: Move the PAT warning " tip-bot for Luis R. Rodriguez

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-fd0a1b8607ef311a2c800dd54c9a4a3583756ea6@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=dledford@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mcgrof@suse.com \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).