[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-fd0a1b8607ef311a2c800dd54c9a4a3583756ea6@git.kernel.org>
Date: Tue, 21 Jul 2015 02:39:56 -0700
From: "tip-bot for Luis R. Rodriguez" <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: torvalds@...ux-foundation.org, mingo@...nel.org,
tglx@...utronix.de, peterz@...radead.org, dledford@...hat.com,
hpa@...or.com, mcgrof@...e.com, linux-kernel@...r.kernel.org
Subject: [tip:x86/urgent] x86/mm/pat, drivers/infiniband/ipath:
Replace WARN() with pr_warn()
Commit-ID: fd0a1b8607ef311a2c800dd54c9a4a3583756ea6
Gitweb: http://git.kernel.org/tip/fd0a1b8607ef311a2c800dd54c9a4a3583756ea6
Author: Luis R. Rodriguez <mcgrof@...e.com>
AuthorDate: Fri, 17 Jul 2015 14:07:24 -0700
Committer: Ingo Molnar <mingo@...nel.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@...e.com>
Acked-by: Doug Ledford <dledford@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: andy@...verblocksystems.net
Cc: benh@...nel.crashing.org
Cc: bp@...e.de
Cc: dan.j.williams@...el.com
Cc: jkosina@...e.cz
Cc: julia.lawall@...6.fr
Cc: luto@...capital.net
Cc: mchehab@....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@...nel.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;
}
--
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