| Message ID | 20161216091700.2499520-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
diff --git a/arch/x86/kernel/paravirt_patch_32.c b/arch/x86/kernel/paravirt_patch_32.c index d33ef165b1f8..2b729b1df391 100644 --- a/arch/x86/kernel/paravirt_patch_32.c +++ b/arch/x86/kernel/paravirt_patch_32.c @@ -68,7 +68,9 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf, #endif default: +#if defined(CONFIG_PARAVIRT_SPINLOCKS) patch_default: +#endif ret = paravirt_patch_default(type, clobbers, ibuf, addr, len); break; diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c index f4fcf26c9fce..b5bff128949a 100644 --- a/arch/x86/kernel/paravirt_patch_64.c +++ b/arch/x86/kernel/paravirt_patch_64.c @@ -80,7 +80,9 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf, #endif default: +#if defined(CONFIG_PARAVIRT_SPINLOCKS) patch_default: +#endif ret = paravirt_patch_default(type, clobbers, ibuf, addr, len); break;
A bugfix introduced a harmless warning: arch/x86/kernel/paravirt_patch_32.c: In function 'native_patch': arch/x86/kernel/paravirt_patch_32.c:71:1: error: label 'patch_default' defined but not used [-Werror=unused-label] This puts it in the same #ifdef as its caller. Fixes: 45dbea5f55c0 ("x86/paravirt: Fix native_patch()") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/x86/kernel/paravirt_patch_32.c | 2 ++ arch/x86/kernel/paravirt_patch_64.c | 2 ++ 2 files changed, 4 insertions(+) -- 2.9.0