linux-kernel - linux-next: build failure after merge of the akpm tree

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>] [day] [month] [year] [list]

Message-ID: <20211201160626.401d828d@canb.auug.org.au>
Date:   Wed, 1 Dec 2021 16:06:26 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Xiaoming Ni <nixiaoming@...wei.com>,
        Luis Chamberlain <mcgrof@...nel.org>
Subject: linux-next: build failure after merge of the akpm tree

Hi all,

After merging the akpm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/base/firmware_loader/fallback_table.c:60:53: error: macro "EXPORT_SYMBOL_NS_GPL" requires 2 arguments, but only 1 given
   60 | EXPORT_SYMBOL_NS_GPL(register_firmware_config_sysctl);
      |                                                     ^
In file included from include/linux/linkage.h:7,
                 from include/linux/printk.h:8,
                 from include/asm-generic/bug.h:22,
                 from arch/x86/include/asm/bug.h:84,
                 from include/linux/bug.h:5,
                 from include/linux/mmdebug.h:5,
                 from include/linux/gfp.h:5,
                 from include/linux/slab.h:15,
                 from drivers/base/firmware_loader/fallback_table.c:6:
include/linux/export.h:166: note: macro "EXPORT_SYMBOL_NS_GPL" defined here
  166 | #define EXPORT_SYMBOL_NS_GPL(sym, ns) __EXPORT_SYMBOL(sym, "_gpl", #ns)
      | 
drivers/base/firmware_loader/fallback_table.c:60:1: error: data definition has no type or storage class [-Werror]
   60 | EXPORT_SYMBOL_NS_GPL(register_firmware_config_sysctl);
      | ^~~~~~~~~~~~~~~~~~~~
drivers/base/firmware_loader/fallback_table.c:60:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_NS_GPL' [-Werror=implicit-int]
drivers/base/firmware_loader/fallback_table.c:67:55: error: macro "EXPORT_SYMBOL_NS_GPL" requires 2 arguments, but only 1 given
   67 | EXPORT_SYMBOL_NS_GPL(unregister_firmware_config_sysctl);
      |                                                       ^
In file included from include/linux/linkage.h:7,
                 from include/linux/printk.h:8,
                 from include/asm-generic/bug.h:22,
                 from arch/x86/include/asm/bug.h:84,
                 from include/linux/bug.h:5,
                 from include/linux/mmdebug.h:5,
                 from include/linux/gfp.h:5,
                 from include/linux/slab.h:15,
                 from drivers/base/firmware_loader/fallback_table.c:6:
include/linux/export.h:166: note: macro "EXPORT_SYMBOL_NS_GPL" defined here
  166 | #define EXPORT_SYMBOL_NS_GPL(sym, ns) __EXPORT_SYMBOL(sym, "_gpl", #ns)
      | 
drivers/base/firmware_loader/fallback_table.c:67:1: error: data definition has no type or storage class [-Werror]
   67 | EXPORT_SYMBOL_NS_GPL(unregister_firmware_config_sysctl);
      | ^~~~~~~~~~~~~~~~~~~~
drivers/base/firmware_loader/fallback_table.c:67:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_NS_GPL' [-Werror=implicit-int]

Caused by commit

  8419b29bbf54 ("firmware_loader-move-firmware-sysctl-to-its-own-files-fix-fix")

I have applied the following for today.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Wed, 1 Dec 2021 15:58:34 +1100
Subject: [PATCH] firmware_loader-move-firmware-sysctl-to-its-own-files-fix-3

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 drivers/base/firmware_loader/fallback_table.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/base/firmware_loader/fallback_table.c b/drivers/base/firmware_loader/fallback_table.c
index c3fb8292acb8..e5ac098d0742 100644
--- a/drivers/base/firmware_loader/fallback_table.c
+++ b/drivers/base/firmware_loader/fallback_table.c
@@ -57,13 +57,13 @@ int register_firmware_config_sysctl(void)
 		return -ENOMEM;
 	return 0;
 }
-EXPORT_SYMBOL_NS_GPL(register_firmware_config_sysctl);
+EXPORT_SYMBOL_NS_GPL(register_firmware_config_sysctl, FIRMWARE_LOADER_PRIVATE);
 
 void unregister_firmware_config_sysctl(void)
 {
 	unregister_sysctl_table(firmware_config_sysct_table_header);
 	firmware_config_sysct_table_header = NULL;
 }
-EXPORT_SYMBOL_NS_GPL(unregister_firmware_config_sysctl);
+EXPORT_SYMBOL_NS_GPL(unregister_firmware_config_sysctl, FIRMWARE_LOADER_PRIVATE);
 
 #endif /* CONFIG_SYSCTL */
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped