linux-kernel - [tip:efi/urgent] efi: Remove duplicate 'const' specifiers

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-684e3f965d0be8c26fedefe94f637374242aba08@git.kernel.org>
Date:   Sun, 28 May 2017 02:44:51 -0700
From:   tip-bot for Arnd Bergmann <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     arnd@...db.de, hpa@...or.com, mingo@...nel.org,
        ard.biesheuvel@...aro.org, peterz@...radead.org,
        jwboyer@...oraproject.org, tglx@...utronix.de, dhowells@...hat.com,
        linux-kernel@...r.kernel.org, torvalds@...ux-foundation.org,
        matt@...eblueprint.co.uk
Subject: [tip:efi/urgent] efi: Remove duplicate 'const' specifiers

Commit-ID:  684e3f965d0be8c26fedefe94f637374242aba08
Gitweb:     http://git.kernel.org/tip/684e3f965d0be8c26fedefe94f637374242aba08
Author:     Arnd Bergmann <arnd@...db.de>
AuthorDate: Fri, 26 May 2017 12:36:48 +0100
Committer:  Ingo Molnar <mingo@...nel.org>
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 <arnd@...db.de>
Signed-off-by: Matt Fleming <matt@...eblueprint.co.uk>
Reviewed-by: David Howells <dhowells@...hat.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@...aro.org>
Cc: Josh Boyer <jwboyer@...oraproject.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: linux-efi@...r.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 <mingo@...nel.org>
---
 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
 };