From patchwork Mon Jun 22 22:31:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 6657651 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D77849F1C1 for ; Mon, 22 Jun 2015 22:36:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3F73B2056C for ; Mon, 22 Jun 2015 22:36:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 862432055D for ; Mon, 22 Jun 2015 22:36:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751408AbbFVWgV (ORCPT ); Mon, 22 Jun 2015 18:36:21 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:34684 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751626AbbFVWgU (ORCPT ); Mon, 22 Jun 2015 18:36:20 -0400 Received: by pabvl15 with SMTP id vl15so96645725pab.1; Mon, 22 Jun 2015 15:36:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=oeVTYWsb6DcETzpcSEnbztXmdBnRzJ9e9aLrOQfTxHs=; b=L0Qe65sfdqZQRWjLZcD8KaXIlCTT+uUOjp2tVyz4JaG8a+xJzNX+D6OL2vBzc2q1Xp RnOebmd/9maEgxKmC9n6qE86mgOXXlo9QeU5Fv3oOiMVdH9Y9wreNPMfFq6aBXZBEiL2 0QenKRGBewuaLQUE5Nyai1Km/j12NJHHkNCcAP/SPWTAPQ8NO4/5J7jWcWuJ8WgM8jnT d7X4KnACYQS7kkCfD+f7jGRsPRTxHFJpudyDuaM9z6Gx59kVji6E9OJXNvq4eFqa19BW RNV8dCX3zykWy6VPSYIacaqeAcbCMv0Rq7iTcQsJV90aCZjfapxrw/Vk2o1hyhtK+ZHq PSIg== X-Received: by 10.68.250.194 with SMTP id ze2mr63811108pbc.24.1435012580022; Mon, 22 Jun 2015 15:36:20 -0700 (PDT) Received: from mcgrof@gmail.com (c-98-234-145-61.hsd1.ca.comcast.net. [98.234.145.61]) by mx.google.com with ESMTPSA id pd10sm20960486pdb.66.2015.06.22.15.36.17 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 22 Jun 2015 15:36:19 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Mon, 22 Jun 2015 15:34:09 -0700 From: "Luis R. Rodriguez" To: bp@suse.de, mchehab@osg.samsung.com, dledford@redhat.com Cc: mingo@kernel.org, fengguang.wu@intel.com, linux-media@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH 1/2] x86/mm/pat, drivers/infiniband/ipath: replace WARN() with pr_warn() Date: Mon, 22 Jun 2015 15:31:57 -0700 Message-Id: <1435012318-381-2-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1435012318-381-1-git-send-email-mcgrof@do-not-panic.com> References: <1435012318-381-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Luis R. Rodriguez" On built-in kernels this will always splat. Fix that. Reported-by: Fengguang Wu [0-day test robot] Signed-off-by: Luis R. Rodriguez --- 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; }