| From 0e6c5e84213222cce65d6983af36132dce0f84a3 Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Wed, 19 Sep 2018 13:35:53 +0300 |
| Subject: x86/paravirt: Fix some warning messages |
| |
| [ Upstream commit 571d0563c8881595f4ab027aef9ed1c55e3e7b7c ] |
| |
| 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 <dan.carpenter@oracle.com> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Reviewed-by: Juergen Gross <jgross@suse.com> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Alok Kataria <akataria@vmware.com> |
| Cc: "H. Peter Anvin" <hpa@zytor.com> |
| Cc: virtualization@lists.linux-foundation.org |
| Cc: kernel-janitors@vger.kernel.org |
| Link: https://lkml.kernel.org/r/20180919103553.GD9238@mwanda |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/x86/kernel/paravirt.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c |
| index 29d465627919..bf9552bebb3c 100644 |
| --- a/arch/x86/kernel/paravirt.c |
| +++ b/arch/x86/kernel/paravirt.c |
| @@ -90,7 +90,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 */ |
| } |
| @@ -110,7 +110,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 */ |
| } |
| -- |
| 2.17.1 |
| |
