Commit-ID: fd0a1b8607ef311a2c800dd54c9a4a3583756ea6 Gitweb: http://git.kernel.org/tip/fd0a1b8607ef311a2c800dd54c9a4a3583756ea6 Author: Luis R. Rodriguez <mcg...@suse.com> AuthorDate: Fri, 17 Jul 2015 14:07:24 -0700 Committer: Ingo Molnar <mi...@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 <mcg...@suse.com> Acked-by: Doug Ledford <dledf...@redhat.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: a...@silverblocksystems.net Cc: b...@kernel.crashing.org Cc: b...@suse.de Cc: dan.j.willi...@intel.com Cc: jkos...@suse.cz Cc: julia.law...@lip6.fr Cc: l...@amacapital.net Cc: mche...@osg.samsung.com Link: http://lkml.kernel.org/r/1437167245-28273-2-git-send-email-mcg...@do-not-panic.com Signed-off-by: Ingo Molnar <mi...@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; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
