Commit-ID: fd0a1b8607ef311a2c800dd54c9a4a3583756ea6
Gitweb: http://git.kernel.org/tip/fd0a1b8607ef311a2c800dd54c9a4a3583756ea6
Author: Luis R. Rodriguez <mcgrof@xxxxxxxx>
AuthorDate: Fri, 17 Jul 2015 14:07:24 -0700
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
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@xxxxxxxx>
Acked-by: Doug Ledford <dledford@xxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: andy@xxxxxxxxxxxxxxxxxxxxxx
Cc: benh@xxxxxxxxxxxxxxxxxxx
Cc: bp@xxxxxxx
Cc: dan.j.williams@xxxxxxxxx
Cc: jkosina@xxxxxxx
Cc: julia.lawall@xxxxxxx
Cc: luto@xxxxxxxxxxxxxx
Cc: mchehab@xxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/1437167245-28273-2-git-send-email-mcgrof@xxxxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
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-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|