From patchwork Wed Oct 17 00:08:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leonardo Bras X-Patchwork-Id: 10644459 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2F4C813B0 for ; Wed, 17 Oct 2018 00:08:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15F762A38C for ; Wed, 17 Oct 2018 00:08:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06FA32A363; Wed, 17 Oct 2018 00:08:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,FROM_EXCESS_BASE64,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA7F12A363 for ; Wed, 17 Oct 2018 00:08:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727410AbeJQIBd (ORCPT ); Wed, 17 Oct 2018 04:01:33 -0400 Received: from mail-qt1-f193.google.com ([209.85.160.193]:37533 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727171AbeJQIBd (ORCPT ); Wed, 17 Oct 2018 04:01:33 -0400 Received: by mail-qt1-f193.google.com with SMTP id d14-v6so28025369qto.4; Tue, 16 Oct 2018 17:08:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :content-transfer-encoding:user-agent; bh=5Q7vGbq961nf2LzoNGlaXLvNyGpktZKrKB9yXgUHndA=; b=EX1hVOn4JuhoKatY4YuCpVLGjN10GHqFZfUCvMSMiGNIuTAA00xiU+efKD7cxPices zFM/hSypQZYAfKES6M2qX+Ss4vwa3K5AyDeSMZWXxcTqV3Z77ChVW783hjcG7i82Ly5O SrlpF7ShP5sjz8BRG4Ry/cGXLWwBcN+KhUAOnPaEqlcyvje20Cu9dDs8ljsaK5SUOt9B 8q195Gn8ZjL/YVw6GAgm0IJMsZAmfazbrstT0DdsmFrFSH+m8kfs5VOhgnpf6UAua25z AKquM1ZT/1tF50i6caYMNbTxGoWiwR+9f70HesWNyaFupGGTX2ggW/84UiJTTTgW99OZ 0VMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:content-transfer-encoding:user-agent; bh=5Q7vGbq961nf2LzoNGlaXLvNyGpktZKrKB9yXgUHndA=; b=hD/1rVPsD07UMbbnH5eMFusMCIF4CTQ+i4qeR2Fs1D3qB5BZbuOiNXq5SAva+2py8D B6hlInB67WSIa2dphKGa2JUDRGcyiH0Lin+mOBwZUdKw9REO4da0YBJOkrCOwNGozv+w x1qcn7lPv/l6mMMMatoXIPLi5yNMknWGVbQSlWfiwcJbmhe/YGN3OolMKyuOb+L/fk+5 K+kNcYtMP952wp43CsosdPr6cIteDUa0xRxLwVlgjvrXZ6pIEm5S5m6DKg/7PUpv5J2W UoizqJIje99SbGeINi90NsBnGE1bErShJ7kr70lmItMW4DAWTxBC52P260bEwLsDG32z LrZw== X-Gm-Message-State: ABuFfoigRA4Fkpz+5qW7Bn3WuauHjLaD9b7+d+AhCz9jrcnXXqQGmCET 4Qe0dk4SdYLDU2ig8DSkxps= X-Google-Smtp-Source: ACcGV61M+Rf/4oky/z9ua/Cvh8YByBKAByZjKqo3Lztq3/NeyNaUN6I8+J/SdiauRyE8kS8ryRw5Ng== X-Received: by 2002:ac8:4790:: with SMTP id k16-v6mr23183700qtq.253.1539734920249; Tue, 16 Oct 2018 17:08:40 -0700 (PDT) Received: from WindFlash ([179.159.21.48]) by smtp.gmail.com with ESMTPSA id o50-v6sm11689672qtj.41.2018.10.16.17.08.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Oct 2018 17:08:39 -0700 (PDT) Date: Tue, 16 Oct 2018 21:08:34 -0300 From: Leonardo =?utf-8?b?QnLDoXM=?= To: lkcamp@lists.libreplanetbr.org Cc: Matthew Wilcox , Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , x86@kernel.org, Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org Subject: [PATCH 2/4] Renames variable to fix shadow warning. Message-ID: <20181017000834.GA21330@WindFlash> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Renames the char variable to avoid shadowing a variable previously declared on this function. Signed-off-by: Leonardo Brás --- arch/x86/entry/vdso/vdso2c.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/entry/vdso/vdso2c.h b/arch/x86/entry/vdso/vdso2c.h index fa847a620f40..9466998d0f28 100644 --- a/arch/x86/entry/vdso/vdso2c.h +++ b/arch/x86/entry/vdso/vdso2c.h @@ -93,11 +93,11 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, int k; ELF(Sym) *sym = raw_addr + GET_LE(&symtab_hdr->sh_offset) + GET_LE(&symtab_hdr->sh_entsize) * i; - const char *name = raw_addr + GET_LE(&strtab_hdr->sh_offset) + + const char *name2 = raw_addr + GET_LE(&strtab_hdr->sh_offset) + GET_LE(&sym->st_name); for (k = 0; k < NSYMS; k++) { - if (!strcmp(name, required_syms[k].name)) { + if (!strcmp(name2, required_syms[k].name)) { if (syms[k]) { fail("duplicate symbol %s\n", required_syms[k].name);