[PATCH 2/2] x86/mm/pat, drivers/media/ivtv: replace WARN() with pr_warn()

From	"Luis R. Rodriguez" <mcgrof@do-not-panic.com>
Newsgroups	linux.kernel
Subject	[PATCH 2/2] x86/mm/pat, drivers/media/ivtv: replace WARN() with pr_warn()
Date	2015-06-23 00:40 +0200
Message-ID	<pEixI-Bm-15@gated-at.bofh.it> (permalink)
References	<pEixI-Bm-17@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: "Luis R. Rodriguez" <mcgrof@suse.com>

On built-in kernels this will always splat. Fix that.

Reported-by: Fengguang Wu <fengguang.wu@intel.com> [0-day test robot]
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
 drivers/media/pci/ivtv/ivtvfb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/media/pci/ivtv/ivtvfb.c b/drivers/media/pci/ivtv/ivtvfb.c
index 4cb365d..6f0c364 100644
--- a/drivers/media/pci/ivtv/ivtvfb.c
+++ b/drivers/media/pci/ivtv/ivtvfb.c
@@ -38,6 +38,8 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/fb.h>
@@ -1266,8 +1268,8 @@ static int __init ivtvfb_init(void)
 	int err;
 
 #ifdef CONFIG_X86_64
-	if (WARN(pat_enabled(),
-		 "ivtvfb needs PAT disabled, boot with nopat kernel parameter\n")) {
+	if (pat_enabled()) {
+		pr_warn("ivtvfb needs PAT disabled, boot with nopat kernel parameter\n");
 		return -ENODEV;
 	}
 #endif
-- 
2.3.2.209.gd67f9d5.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 2/2] x86/mm/pat, drivers/media/ivtv: replace WARN() with pr_warn() "Luis R. Rodriguez" <mcgrof@do-not-panic.com> - 2015-06-23 00:40 +0200

csiph-web