]> git.baikalelectronics.ru Git - kernel.git/commitdiff
certs/blacklist_hashes.c: fix const confusion in certs blacklist
authorMasahiro Yamada <masahiroy@kernel.org>
Sat, 11 Jun 2022 17:22:30 +0000 (02:22 +0900)
committerJarkko Sakkinen <jarkko@kernel.org>
Wed, 15 Jun 2022 18:52:32 +0000 (21:52 +0300)
This file fails to compile as follows:

  CC      certs/blacklist_hashes.o
certs/blacklist_hashes.c:4:1: error: ignoring attribute ‘section (".init.data")’ because it conflicts with previous ‘section (".init.rodata")’ [-Werror=attributes]
    4 | const char __initdata *const blacklist_hashes[] = {
      | ^~~~~
In file included from certs/blacklist_hashes.c:2:
certs/blacklist.h:5:38: note: previous declaration here
    5 | extern const char __initconst *const blacklist_hashes[];
      |                                      ^~~~~~~~~~~~~~~~

Apply the same fix as commit 38848fdd08b5 ("certs/blacklist_nohashes.c:
fix const confusion in certs blacklist").

Fixes: c069e087bc5a ("KEYS: Add a system blacklist keyring")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Reviewed-by: Mickaël Salaün <mic@linux.microsoft.com>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
certs/blacklist_hashes.c

index 344892337be0797cc713877ad64014b8cacaec20..d5961aa3d3380c5fdfadd6bff49dddd97c41060d 100644 (file)
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "blacklist.h"
 
-const char __initdata *const blacklist_hashes[] = {
+const char __initconst *const blacklist_hashes[] = {
 #include CONFIG_SYSTEM_BLACKLIST_HASH_LIST
        , NULL
 };