From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751095AbdE1JuX (ORCPT ); Sun, 28 May 2017 05:50:23 -0400 Received: from terminus.zytor.com ([65.50.211.136]:36289 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750839AbdE1JuV (ORCPT ); Sun, 28 May 2017 05:50:21 -0400 Date: Sun, 28 May 2017 02:44:51 -0700 From: tip-bot for Arnd Bergmann Message-ID: Cc: arnd@arndb.de, hpa@zytor.com, mingo@kernel.org, ard.biesheuvel@linaro.org, peterz@infradead.org, jwboyer@fedoraproject.org, tglx@linutronix.de, dhowells@redhat.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, matt@codeblueprint.co.uk Reply-To: mingo@kernel.org, hpa@zytor.com, arnd@arndb.de, linux-kernel@vger.kernel.org, matt@codeblueprint.co.uk, torvalds@linux-foundation.org, ard.biesheuvel@linaro.org, tglx@linutronix.de, dhowells@redhat.com, jwboyer@fedoraproject.org, peterz@infradead.org In-Reply-To: <20170526113652.21339-3-matt@codeblueprint.co.uk> References: <20170526113652.21339-3-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/urgent] efi: Remove duplicate 'const' specifiers Git-Commit-ID: 684e3f965d0be8c26fedefe94f637374242aba08 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 684e3f965d0be8c26fedefe94f637374242aba08 Gitweb: http://git.kernel.org/tip/684e3f965d0be8c26fedefe94f637374242aba08 Author: Arnd Bergmann AuthorDate: Fri, 26 May 2017 12:36:48 +0100 Committer: Ingo Molnar CommitDate: Sun, 28 May 2017 11:06:16 +0200 efi: Remove duplicate 'const' specifiers gcc-7 shows these harmless warnings: 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. Signed-off-by: Arnd Bergmann Signed-off-by: Matt Fleming Reviewed-by: David Howells Acked-by: Ard Biesheuvel Cc: Josh Boyer Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Fixes: de8cb458625c ("efi: Get and store the secure boot status") Link: http://lkml.kernel.org/r/20170526113652.21339-3-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- drivers/firmware/efi/libstub/secureboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/libstub/secureboot.c b/drivers/firmware/efi/libstub/secureboot.c index 8c34d50..959777e 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 };