From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759987AbcLPJwD (ORCPT ); Fri, 16 Dec 2016 04:52:03 -0500 Received: from merlin.infradead.org ([205.233.59.134]:45936 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757063AbcLPJv4 (ORCPT ); Fri, 16 Dec 2016 04:51:56 -0500 Date: Fri, 16 Dec 2016 10:51:50 +0100 From: Peter Zijlstra To: Arnd Bergmann Cc: Ingo Molnar , x86@kernel.org, Thomas Gleixner , "H. Peter Anvin" , virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] x86/paravirt: hide unused patch_default label Message-ID: <20161216095150.GQ3107@twins.programming.kicks-ass.net> References: <20161216091700.2499520-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161216091700.2499520-1-arnd@arndb.de> User-Agent: Mutt/1.5.23.1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Dec 16, 2016 at 10:16:35AM +0100, Arnd Bergmann wrote: > 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 > --- This seems to work as well and is less invasive arch/x86/kernel/paravirt_patch_32.c | 2 +- arch/x86/kernel/paravirt_patch_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/paravirt_patch_32.c b/arch/x86/kernel/paravirt_patch_32.c index d33ef165b1f8..553acbbb4d32 100644 --- a/arch/x86/kernel/paravirt_patch_32.c +++ b/arch/x86/kernel/paravirt_patch_32.c @@ -68,7 +68,7 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf, #endif default: -patch_default: +patch_default: __maybe_unused 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..11aaf1eaa0e4 100644 --- a/arch/x86/kernel/paravirt_patch_64.c +++ b/arch/x86/kernel/paravirt_patch_64.c @@ -80,7 +80,7 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf, #endif default: -patch_default: +patch_default: __maybe_unused ret = paravirt_patch_default(type, clobbers, ibuf, addr, len); break;