Skip to contentSkip to conversation

x86/paravirt: fix some warning messages

PATCH In review Dan Carpenter 3 participants 3 messages Sep 19, 2018

Subsystems (4)
x86 Kernel janitors virtio core PARAVIRT_OPS interface
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 x86/paravirt: fix some warning messages

The first argument to WARN_ONCE() is a condition.

Fixes 5800dc5c19f3 ("x86/paravirt: Fix spectre-v2 mitigations for paravirt guests")
Signed-off-by Dan Carpenter <[email protected]>
arch/x86/kernel/paravirt.c +2 -2
index bbf006fe78d7..e4d4df37922a 100644
@@ -89,7 +89,7 @@ static unsigned paravirt_patch_call(void *insnbuf, const void *target,
 
 	if (len < 5) {
 #ifdef CONFIG_RETPOLINE
-		WARN_ONCE("Failing to patch indirect CALL in %ps\n", (void *)addr);
+		WARN_ONCE(1, "Failing to patch indirect CALL in %ps\n", (void *)addr);
 #endif
 		return len;	/* call too long for patch site */
 	}

@@ -110,7 +110,7 @@ static unsigned paravirt_patch_jmp(void *insnbuf, const void *target,
 
 	if (len < 5) {
 #ifdef CONFIG_RETPOLINE
-		WARN_ONCE("Failing to patch indirect JMP in %ps\n", (void *)addr);
+		WARN_ONCE(1, "Failing to patch indirect JMP in %ps\n", (void *)addr);
 #endif
 		return len;	/* call too long for patch site */
 	}
merge bot
#2 lore raw

[tip:x86/urgent] x86/paravirt: Fix some warning messages

In reply to Dan Carpenter
x86/paravirt: Fix some warning messages
Commit-ID:  571d0563c8881595f4ab027aef9ed1c55e3e7b7c
Gitweb:     https://git.kernel.org/tip/571d0563c8881595f4ab027aef9ed1c55e3e7b7c
Author:     Dan Carpenter <[email protected]>
AuthorDate: Wed, 19 Sep 2018 13:35:53 +0300
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Wed, 19 Sep 2018 13:22:04 +0200

x86/paravirt: Fix some warning messages

The first argument to WARN_ONCE() is a condition.

Fixes 5800dc5c19f3 ("x86/paravirt: Fix spectre-v2 mitigations for paravirt guests")
Signed-off-by Dan Carpenter <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Reviewed-by Juergen Gross <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Alok Kataria <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc [email protected]
Cc [email protected]
Link https://lkml.kernel.org/r/20180919103553.GD9238@mwanda open here
---
 arch/x86/kernel/paravirt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/paravirt.c +2 -2
index afdb303285f8..8dc69d82567e 100644
@@ -91,7 +91,7 @@ unsigned paravirt_patch_call(void *insnbuf,
 
 	if (len < 5) {
 #ifdef CONFIG_RETPOLINE
-		WARN_ONCE("Failing to patch indirect CALL in %ps\n", (void *)addr);
+		WARN_ONCE(1, "Failing to patch indirect CALL in %ps\n", (void *)addr);
 #endif
 		return len;	/* call too long for patch site */
 	}

@@ -111,7 +111,7 @@ unsigned paravirt_patch_jmp(void *insnbuf, const void *target,
 
 	if (len < 5) {
 #ifdef CONFIG_RETPOLINE
-		WARN_ONCE("Failing to patch indirect JMP in %ps\n", (void *)addr);
+		WARN_ONCE(1, "Failing to patch indirect JMP in %ps\n", (void *)addr);
 #endif
 		return len;	/* call too long for patch site */
 	}