From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760071AbcLPJTe (ORCPT ); Fri, 16 Dec 2016 04:19:34 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:61646 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754882AbcLPJTW (ORCPT ); Fri, 16 Dec 2016 04:19:22 -0500 From: Arnd Bergmann To: Ingo Molnar , x86@kernel.org Cc: Peter Zijlstra , Arnd Bergmann , Thomas Gleixner , "H. Peter Anvin" , virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH] x86/paravirt: hide unused patch_default label Date: Fri, 16 Dec 2016 10:16:35 +0100 Message-Id: <20161216091700.2499520-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:KB9YlZqbKeMS8BaKoBmb+BxrZSH4ura+nYvP6aV+TdQAIqC0j1G jX4LriGRGFBr7XuU/gc2rYlf1gkOgt6SmiKYDn1TRATLwGb8rCxlkX9YrPYV9tLwyTvqrsI KpSsoA9AgOsDsIhbXHgmDWGrhZVLH1i5GRzHJDiHAMk7jsmEVkLB/2VbGkQwX98F8xfQQEk a5yhCjCiFXmKS7Q84svqg== X-UI-Out-Filterresults: notjunk:1;V01:K0:WMK3AG/rc9c=:rycpZ7BSRyztM9NbRh6DiA 3o1E/Atp7/vXDXeTR5zSgGzYA/JovEexfAXeQ1i8gOL/rlwCTfkrEVIhW12XbQUTrVdizWCxv BUCFmPn3KLgCp9bRphFvGJynP6amIYaLFvog+jYyfGLXeOmuH8r7ePjt3fjSdWxMJyq+U0VCB Xbvpeag57i+UHEaeHe0DHUXBaEsgDnXyZZvBoLzuNf6GAVxHK4luV6x2ZZ8omfqmdYPYjObdf nDF+OvoQ99DTTvNhpX2GInf8xLD5kxFjRnV+ChSp1pKguKw739/Ayv/egt1Q5ZXvLHZccrMS+ JUSqL4bXk8YAZBKZ6+zwUBmB4hkm+KNLOHJpaAXcReT/LouD+fYf3/9WZzNweHmig+f3qJ8eY ytvbmNTYvWLJtckATy2H3CUy/SvAJdgiv2CpG56sSHTfq/p4jeg3cSs52cegpp3pNdTACRXu8 gSMCnul3h1AjIEvh/n+4mGnxX/gcvvtm8pmM47Xoavz3KYSMHBU9+Gszij4GevAwIadfXXZ37 P0F2++rRJzZ3LXfpAHmdKlApXQSa6sJ3PAqZdOUb6LKMpPOOuVwBzm9cWQCW+dZJK0NIFI0at WjmPai0v4qA2AjKNGSoLMeRJemxN+8t5kiQTYXmbKRQfrYgY+bVsW8OX9ZFp9dUChKLRmzD2E 2DRHdkq5ayWm3N07zniy2ccPkKSttoPiff615FnlTNVtn7Hd7zSbaE/ixtC9g+ufQqCQ= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/x86/kernel/paravirt_patch_32.c | 2 ++ arch/x86/kernel/paravirt_patch_64.c | 2 ++ 2 files changed, 4 insertions(+) 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; -- 2.9.0