From patchwork Fri May 26 11:36:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 100571 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp206932qge; Fri, 26 May 2017 04:37:18 -0700 (PDT) X-Received: by 10.99.104.136 with SMTP id d130mr1895822pgc.27.1495798638190; Fri, 26 May 2017 04:37:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495798638; cv=none; d=google.com; s=arc-20160816; b=fY21kWOpu2Yost0o2QcXFew+axk1okJtWaAXaiwtMGMeG2pp7PQeF4MCtPaPWokCSd YISUOneKu5kAMRDTTXDu/25EQeQ1fNeuKoJMFiD7gWgOOoYj4n89XYpXloiiRq0+/FW/ +/JKPA+cdnvdfvJYkUTtjVB17LB2hkCK1W8vBCwiUajCryp59cJ+wJ23GgaV2/SswixQ Gu9S41MimiQHbXecld9Vovc047NtN0n+AQ9ivBbJ1xVkdHvAbxVS6ewqIc+bbzdewpQL LpjnyXYOgrspc+oTo8KxQFAlfqEzw8TioN0/fBm1ECvaE1n15P7HXXTJAbBDV0CZop3+ iw+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=y5MWqDB0wg7NpuQ+65JF4GQSm9+RA+K8vL+pgBmcpKI=; b=P6ND2Tqyqzn4QzSjw9dM67OovmEU31khugVe/2uDO/n0ZzbDWnCaFleP3CySaVhKt8 owUThZ9CHVYdQL2M6203LIb3ltU/+gmXxfNORDT8z+kf68vlmSVWk2F/wxDS0nbMwrMj Pb/rsVfGnBvTFas9mY9sN4awCWnv5pKQjNlDPiexJwFQC+zXwnwGzXwN1HGQt1PlSbOi R1L8rCC5gGXdw2xSrnHrCH7LptZD4aIGGstlFJ+pgc2ddqOKCwltZQ7slTYoQd0Zf/wm mCiO9EwNlpKJP+eipFuepNbmJjhmKsAflY7X8qSCoL6EqkHXjhWNplOidgLoAl8XDwY3 Nakg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@codeblueprint-co-uk.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l70si569776pfb.415.2017.05.26.04.37.18; Fri, 26 May 2017 04:37:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@codeblueprint-co-uk.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1426193AbdEZLhF (ORCPT + 2 others); Fri, 26 May 2017 07:37:05 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:35947 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1426170AbdEZLg6 (ORCPT ); Fri, 26 May 2017 07:36:58 -0400 Received: by mail-wm0-f51.google.com with SMTP id 7so125452789wmo.1 for ; Fri, 26 May 2017 04:36:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeblueprint-co-uk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aoWJs8RP8naHmRVqZcrn39shLlYgpT9ofCmh39aEBXw=; b=VbFcvp2GnRviuoJPWUfQEh1p5Sfmzs0YXsG+FIC8UwSQQzinJfm800p/+yelU2gku2 IwO1vHk8oHffS3qCnjWssLpIbAq55bnNBf0+DKjlJn+NH+yW/0yKPgWksDL5bG2rMWzo ukes0JwSO6IDYIvln8FwXmGphG7LIRXJEck1iX20n3X8n8IT7JC+UiJLauvTF/ao4zcs eT6DhV7dOpvp9Rv7X8Vu6Xk0F+R/YZzomGwEe7x1GFl2hlKrkrRrjPwOqnVG6ASW88ET GUsIrkGTFDPA+XeAFC1mLtMmXhhUn9yNCGJIXHhDceK1DK08YbWR2EgKRRSsCCB/5Mka YK+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aoWJs8RP8naHmRVqZcrn39shLlYgpT9ofCmh39aEBXw=; b=i4mPWs1VW1SncK5lqM1o/AxvhJNdpqa1AoE/rDqZ38adcYtOfFfvnJj9fNvCrsQ685 YHKzb2x/PClcvZ+ZBkPZ4QWnzHrdu3lYNAbiktfvlvuns5TZfeE9LZhgExMO6NMfdfyo qKSRSpvwV+sqN3VARVwTdV917m2R3RmN4RYrhOGtSf8YnNmquv731+KwQuHRN4UICsqu HlmSGGE0enlaEVecCB1H6OxP3q/KMi+wwLZZTkuuMPLoiRzwoM82pLufUNXnSDmExFeW QKXSW/R40wIot4BhBNiJd4SAwkXBgUW4p0ruPIy0r7BL1Y0KOBFocMnbs2sXYhYQpBJj lxLg== X-Gm-Message-State: AODbwcAcEfOQbJGwIBI/yHJrpKS4oVMDv146E80TjHLuy32KGwOx522t Uq9eyZeIKmKE5AgL X-Received: by 10.80.152.112 with SMTP id h45mr2154139edb.103.1495798616522; Fri, 26 May 2017 04:36:56 -0700 (PDT) Received: from localhost ([176.27.14.213]) by smtp.gmail.com with ESMTPSA id d38sm623436edb.26.2017.05.26.04.36.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 May 2017 04:36:55 -0700 (PDT) From: Matt Fleming To: Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Arnd Bergmann , Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Matt Fleming , David Howells , Josh Boyer Subject: [PATCH 2/5] efi: Remove duplicate 'const' specifiers Date: Fri, 26 May 2017 12:36:48 +0100 Message-Id: <20170526113652.21339-3-matt@codeblueprint.co.uk> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170526113652.21339-1-matt@codeblueprint.co.uk> References: <20170526113652.21339-1-matt@codeblueprint.co.uk> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org From: Arnd Bergmann gcc-7 shows a harmless warning: drivers/firmware/efi/libstub/secureboot.c:19:27: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier] static const efi_char16_t const efi_SecureBoot_name[] = { drivers/firmware/efi/libstub/secureboot.c:22:27: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier] Removing one of the specifiers gives us the expected behavior. Fixes: de8cb458625c ("efi: Get and store the secure boot status") Signed-off-by: Arnd Bergmann Acked-by: Ard Biesheuvel Reviewed-by: David Howells Cc: Josh Boyer Cc: Ingo Molnar Signed-off-by: Matt Fleming --- drivers/firmware/efi/libstub/secureboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.12.2 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/firmware/efi/libstub/secureboot.c b/drivers/firmware/efi/libstub/secureboot.c index 8c34d50a4d80..959777ec8a77 100644 --- a/drivers/firmware/efi/libstub/secureboot.c +++ b/drivers/firmware/efi/libstub/secureboot.c @@ -16,10 +16,10 @@ /* BIOS variables */ static const efi_guid_t efi_variable_guid = EFI_GLOBAL_VARIABLE_GUID; -static const efi_char16_t const efi_SecureBoot_name[] = { +static const efi_char16_t efi_SecureBoot_name[] = { 'S', 'e', 'c', 'u', 'r', 'e', 'B', 'o', 'o', 't', 0 }; -static const efi_char16_t const efi_SetupMode_name[] = { +static const efi_char16_t efi_SetupMode_name[] = { 'S', 'e', 't', 'u', 'p', 'M', 'o', 'd', 'e', 0 };