Skip to content

Commit cdd30eb

Browse files
Peter Zijlstratorvalds
Peter Zijlstra
authored and
torvalds
committed
module: Convert symbol namespace to string literal
Clean up the existing export namespace code along the same lines of commit 33def84 ("treewide: Convert macro and uses of __section(foo) to __section("foo")") and for the same reason, it is not desired for the namespace argument to be a macro expansion itself. Scripted using git grep -l -e MODULE_IMPORT_NS -e EXPORT_SYMBOL_NS | while read file; do awk -i inplace ' /^#define EXPORT_SYMBOL_NS/ { gsub(/__stringify\(ns\)/, "ns"); print; next; } /^#define MODULE_IMPORT_NS/ { gsub(/__stringify\(ns\)/, "ns"); print; next; } /MODULE_IMPORT_NS/ { $0 = gensub(/MODULE_IMPORT_NS\(([^)]*)\)/, "MODULE_IMPORT_NS(\"\\1\")", "g"); } /EXPORT_SYMBOL_NS/ { if ($0 ~ /(EXPORT_SYMBOL_NS[^(]*)\(([^,]+),/) { if ($0 !~ /(EXPORT_SYMBOL_NS[^(]*)\(([^,]+), ([^)]+)\)/ && $0 !~ /(EXPORT_SYMBOL_NS[^(]*)\(\)/ && $0 !~ /^my/) { getline line; gsub(/[[:space:]]*\\$/, ""); gsub(/[[:space:]]/, "", line); $0 = $0 " " line; } $0 = gensub(/(EXPORT_SYMBOL_NS[^(]*)\(([^,]+), ([^)]+)\)/, "\\1(\\2, \"\\3\")", "g"); } } { print }' $file; done Requested-by: Masahiro Yamada <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://mail.google.com/mail/u/2/#inbox/FMfcgzQXKWgMmjdFwwdsfgxzKpVHWPlc Acked-by: Greg KH <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent e70140b commit cdd30eb

File tree

876 files changed

+2189
-2196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

876 files changed

+2189
-2196
lines changed

‎Documentation/core-api/symbol-namespaces.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Please note that due to macro expansion that argument needs to be a
4646
preprocessor symbol. E.g. to export the symbol ``usb_stor_suspend`` into the
4747
namespace ``USB_STORAGE``, use::
4848

49-
EXPORT_SYMBOL_NS(usb_stor_suspend, USB_STORAGE);
49+
EXPORT_SYMBOL_NS(usb_stor_suspend, "USB_STORAGE");
5050

5151
The corresponding ksymtab entry struct ``kernel_symbol`` will have the member
5252
``namespace`` set accordingly. A symbol that is exported without a namespace will
@@ -94,7 +94,7 @@ for the namespaces it uses symbols from. E.g. a module using the
9494
usb_stor_suspend symbol from above, needs to import the namespace USB_STORAGE
9595
using a statement like::
9696

97-
MODULE_IMPORT_NS(USB_STORAGE);
97+
MODULE_IMPORT_NS("USB_STORAGE");
9898

9999
This will create a ``modinfo`` tag in the module for each imported namespace.
100100
This has the side effect, that the imported namespaces of a module can be
@@ -106,7 +106,7 @@ inspected with modinfo::
106106
[...]
107107

108108

109-
It is advisable to add the MODULE_IMPORT_NS() statement close to other module
109+
It is advisable to add the MODULE_IMPORT_NS("") statement close to other module
110110
metadata definitions like MODULE_AUTHOR() or MODULE_LICENSE(). Refer to section
111111
5. for a way to create missing import statements automatically.
112112

@@ -128,7 +128,7 @@ enable loading regardless, but will emit a warning.
128128
Missing namespaces imports can easily be detected at build time. In fact,
129129
modpost will emit a warning if a module uses a symbol from a namespace
130130
without importing it.
131-
MODULE_IMPORT_NS() statements will usually be added at a definite location
131+
MODULE_IMPORT_NS("") statements will usually be added at a definite location
132132
(along with other module meta data). To make the life of module authors (and
133133
subsystem maintainers) easier, a script and make target is available to fixup
134134
missing imports. Fixing missing imports can be done with::

‎Documentation/translations/it_IT/core-api/symbol-namespaces.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Tenete presente che per via dell'espansione delle macro questo argomento deve
4343
essere un simbolo di preprocessore. Per esempio per esportare il
4444
simbolo ``usb_stor_suspend`` nello spazio dei nomi ``USB_STORAGE`` usate::
4545

46-
EXPORT_SYMBOL_NS(usb_stor_suspend, USB_STORAGE);
46+
EXPORT_SYMBOL_NS(usb_stor_suspend, "USB_STORAGE");
4747

4848
Di conseguenza, nella tabella dei simboli del kernel ci sarà una voce
4949
rappresentata dalla struttura ``kernel_symbol`` che avrà il campo
@@ -94,7 +94,7 @@ dei nomi che contiene i simboli desiderati. Per esempio un modulo che
9494
usa il simbolo usb_stor_suspend deve importare lo spazio dei nomi
9595
USB_STORAGE usando la seguente dichiarazione::
9696

97-
MODULE_IMPORT_NS(USB_STORAGE);
97+
MODULE_IMPORT_NS("USB_STORAGE");
9898

9999
Questo creerà un'etichetta ``modinfo`` per ogni spazio dei nomi
100100
importato. Un risvolto di questo fatto è che gli spazi dei
@@ -107,7 +107,7 @@ modinfo::
107107
[...]
108108

109109

110-
Si consiglia di posizionare la dichiarazione MODULE_IMPORT_NS() vicino
110+
Si consiglia di posizionare la dichiarazione MODULE_IMPORT_NS("") vicino
111111
ai metadati del modulo come MODULE_AUTHOR() o MODULE_LICENSE(). Fate
112112
riferimento alla sezione 5. per creare automaticamente le importazioni
113113
mancanti.
@@ -131,7 +131,7 @@ emetterà un avviso.
131131
La mancanza di un'importazione può essere individuata facilmente al momento
132132
della compilazione. Infatti, modpost emetterà un avviso se il modulo usa
133133
un simbolo da uno spazio dei nomi che non è stato importato.
134-
La dichiarazione MODULE_IMPORT_NS() viene solitamente aggiunta in un posto
134+
La dichiarazione MODULE_IMPORT_NS("") viene solitamente aggiunta in un posto
135135
ben definito (assieme agli altri metadati del modulo). Per facilitare
136136
la vita di chi scrive moduli (e i manutentori di sottosistemi), esistono uno
137137
script e un target make per correggere le importazioni mancanti. Questo può

‎Documentation/translations/zh_CN/core-api/symbol-namespaces.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
要是一个预处理器符号。例如，要把符号 ``usb_stor_suspend`` 导出到命名空间 ``USB_STORAGE``，
4949
请使用::
5050

51-
EXPORT_SYMBOL_NS(usb_stor_suspend, USB_STORAGE);
51+
EXPORT_SYMBOL_NS(usb_stor_suspend, "USB_STORAGE");
5252

5353
相应的 ksymtab 条目结构体 ``kernel_symbol`` 将有相应的成员 ``命名空间`` 集。
5454
导出时未指明命名空间的符号将指向 ``NULL`` 。如果没有定义命名空间，则默认没有。
@@ -88,7 +88,7 @@
8888
表示它所使用的命名空间的符号。例如，一个使用usb_stor_suspend符号的
8989
模块，需要使用如下语句导入命名空间USB_STORAGE::
9090

91-
MODULE_IMPORT_NS(USB_STORAGE);
91+
MODULE_IMPORT_NS("USB_STORAGE");
9292

9393
这将在模块中为每个导入的命名空间创建一个 ``modinfo`` 标签。这也顺带
9494
使得可以用modinfo检查模块已导入的命名空间::
@@ -99,7 +99,7 @@
9999
[...]
100100

101101

102-
建议将 MODULE_IMPORT_NS() 语句添加到靠近其他模块元数据定义的地方，
102+
建议将 MODULE_IMPORT_NS("") 语句添加到靠近其他模块元数据定义的地方，
103103
如 MODULE_AUTHOR() 或 MODULE_LICENSE() 。关于自动创建缺失的导入
104104
语句的方法，请参考第5节。
105105

@@ -118,7 +118,7 @@ EINVAL方式失败。要允许加载不满足这个前提条件的模块，可
118118

119119
缺少命名空间的导入可以在构建时很容易被检测到。事实上，如果一个模块
120120
使用了一个命名空间的符号而没有导入它，modpost会发出警告。
121-
MODULE_IMPORT_NS()语句通常会被添加到一个明确的位置（和其他模块元
121+
MODULE_IMPORT_NS("")语句通常会被添加到一个明确的位置（和其他模块元
122122
数据一起）。为了使模块作者（和子系统维护者）的生活更加轻松，我们提
123123
供了一个脚本和make目标来修复丢失的导入。修复丢失的导入可以用::
124124

‎arch/arm64/crypto/aes-ce-ccm-glue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "aes-ce-setkey.h"
2020

21-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
21+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");
2222

2323
static int num_rounds(struct crypto_aes_ctx *ctx)
2424
{

‎arch/arm64/crypto/aes-glue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ static int __init aes_init(void)
10481048

10491049
#ifdef USE_V8_CRYPTO_EXTENSIONS
10501050
module_cpu_feature_match(AES, aes_init);
1051-
EXPORT_SYMBOL_NS(ce_aes_mac_update, CRYPTO_INTERNAL);
1051+
EXPORT_SYMBOL_NS(ce_aes_mac_update, "CRYPTO_INTERNAL");
10521052
#else
10531053
module_init(aes_init);
10541054
EXPORT_SYMBOL(neon_aes_ecb_encrypt);

‎arch/powerpc/crypto/vmx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ MODULE_DESCRIPTION("IBM VMX cryptographic acceleration instructions "
7474
"support on Power 8");
7575
MODULE_LICENSE("GPL");
7676
MODULE_VERSION("1.0.0");
77-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
77+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎arch/s390/crypto/aes_s390.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,4 +1168,4 @@ MODULE_ALIAS_CRYPTO("aes-all");
11681168

11691169
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");
11701170
MODULE_LICENSE("GPL");
1171-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
1171+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎arch/x86/mm/pat/set_memory.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ bool cpu_cache_has_invalidate_memregion(void)
354354
{
355355
return !cpu_feature_enabled(X86_FEATURE_HYPERVISOR);
356356
}
357-
EXPORT_SYMBOL_NS_GPL(cpu_cache_has_invalidate_memregion, DEVMEM);
357+
EXPORT_SYMBOL_NS_GPL(cpu_cache_has_invalidate_memregion, "DEVMEM");
358358

359359
int cpu_cache_invalidate_memregion(int res_desc)
360360
{
@@ -363,7 +363,7 @@ int cpu_cache_invalidate_memregion(int res_desc)
363363
wbinvd_on_all_cpus();
364364
return 0;
365365
}
366-
EXPORT_SYMBOL_NS_GPL(cpu_cache_invalidate_memregion, DEVMEM);
366+
EXPORT_SYMBOL_NS_GPL(cpu_cache_invalidate_memregion, "DEVMEM");
367367
#endif
368368

369369
static void __cpa_flush_all(void *arg)

‎crypto/adiantum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,4 +646,4 @@ MODULE_DESCRIPTION("Adiantum length-preserving encryption mode");
646646
MODULE_LICENSE("GPL v2");
647647
MODULE_AUTHOR("Eric Biggers <[email protected]>");
648648
MODULE_ALIAS_CRYPTO("adiantum");
649-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
649+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/ansi_cprng.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,4 +471,4 @@ subsys_initcall(prng_mod_init);
471471
module_exit(prng_mod_fini);
472472
MODULE_ALIAS_CRYPTO("stdrng");
473473
MODULE_ALIAS_CRYPTO("ansi_cprng");
474-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
474+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/ccm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -949,4 +949,4 @@ MODULE_ALIAS_CRYPTO("ccm_base");
949949
MODULE_ALIAS_CRYPTO("rfc4309");
950950
MODULE_ALIAS_CRYPTO("ccm");
951951
MODULE_ALIAS_CRYPTO("cbcmac");
952-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
952+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/cipher.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ int crypto_cipher_setkey(struct crypto_cipher *tfm,
5353

5454
return cia->cia_setkey(crypto_cipher_tfm(tfm), key, keylen);
5555
}
56-
EXPORT_SYMBOL_NS_GPL(crypto_cipher_setkey, CRYPTO_INTERNAL);
56+
EXPORT_SYMBOL_NS_GPL(crypto_cipher_setkey, "CRYPTO_INTERNAL");
5757

5858
static inline void cipher_crypt_one(struct crypto_cipher *tfm,
5959
u8 *dst, const u8 *src, bool enc)
@@ -81,14 +81,14 @@ void crypto_cipher_encrypt_one(struct crypto_cipher *tfm,
8181
{
8282
cipher_crypt_one(tfm, dst, src, true);
8383
}
84-
EXPORT_SYMBOL_NS_GPL(crypto_cipher_encrypt_one, CRYPTO_INTERNAL);
84+
EXPORT_SYMBOL_NS_GPL(crypto_cipher_encrypt_one, "CRYPTO_INTERNAL");
8585

8686
void crypto_cipher_decrypt_one(struct crypto_cipher *tfm,
8787
u8 *dst, const u8 *src)
8888
{
8989
cipher_crypt_one(tfm, dst, src, false);
9090
}
91-
EXPORT_SYMBOL_NS_GPL(crypto_cipher_decrypt_one, CRYPTO_INTERNAL);
91+
EXPORT_SYMBOL_NS_GPL(crypto_cipher_decrypt_one, "CRYPTO_INTERNAL");
9292

9393
struct crypto_cipher *crypto_clone_cipher(struct crypto_cipher *cipher)
9494
{

‎crypto/cmac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,4 +313,4 @@ module_exit(crypto_cmac_module_exit);
313313
MODULE_LICENSE("GPL");
314314
MODULE_DESCRIPTION("CMAC keyed hash algorithm");
315315
MODULE_ALIAS_CRYPTO("cmac");
316-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
316+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/ctr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,4 +357,4 @@ MODULE_LICENSE("GPL");
357357
MODULE_DESCRIPTION("CTR block cipher mode of operation");
358358
MODULE_ALIAS_CRYPTO("rfc3686");
359359
MODULE_ALIAS_CRYPTO("ctr");
360-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
360+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/drbg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2151,4 +2151,4 @@ MODULE_DESCRIPTION("NIST SP800-90A Deterministic Random Bit Generator (DRBG) "
21512151
CRYPTO_DRBG_HMAC_STRING
21522152
CRYPTO_DRBG_CTR_STRING);
21532153
MODULE_ALIAS_CRYPTO("stdrng");
2154-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
2154+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/ecb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,4 +225,4 @@ module_exit(crypto_ecb_module_exit);
225225
MODULE_LICENSE("GPL");
226226
MODULE_DESCRIPTION("ECB block cipher mode of operation");
227227
MODULE_ALIAS_CRYPTO("ecb");
228-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
228+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/essiv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,4 +649,4 @@ module_exit(essiv_module_exit);
649649
MODULE_DESCRIPTION("ESSIV skcipher/aead wrapper for block encryption");
650650
MODULE_LICENSE("GPL v2");
651651
MODULE_ALIAS_CRYPTO("essiv");
652-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
652+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/hctr2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,4 +576,4 @@ module_exit(hctr2_module_exit);
576576
MODULE_DESCRIPTION("HCTR2 length-preserving encryption mode");
577577
MODULE_LICENSE("GPL v2");
578578
MODULE_ALIAS_CRYPTO("hctr2");
579-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
579+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/keywrap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,4 +317,4 @@ MODULE_LICENSE("Dual BSD/GPL");
317317
MODULE_AUTHOR("Stephan Mueller <[email protected]>");
318318
MODULE_DESCRIPTION("Key Wrapping (RFC3394 / NIST SP800-38F)");
319319
MODULE_ALIAS_CRYPTO("kw");
320-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
320+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/pcbc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,4 +192,4 @@ module_exit(crypto_pcbc_module_exit);
192192
MODULE_LICENSE("GPL");
193193
MODULE_DESCRIPTION("PCBC block cipher mode of operation");
194194
MODULE_ALIAS_CRYPTO("pcbc");
195-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
195+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/skcipher.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,4 +1085,4 @@ EXPORT_SYMBOL_GPL(skcipher_alloc_instance_simple);
10851085

10861086
MODULE_LICENSE("GPL");
10871087
MODULE_DESCRIPTION("Symmetric key cipher type");
1088-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
1088+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/testmgr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
#include "internal.h"
4141

42-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
42+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");
4343

4444
static bool notests;
4545
module_param(notests, bool, 0644);

‎crypto/vmac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,4 +693,4 @@ module_exit(vmac_module_exit);
693693
MODULE_LICENSE("GPL");
694694
MODULE_DESCRIPTION("VMAC hash algorithm");
695695
MODULE_ALIAS_CRYPTO("vmac64");
696-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
696+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/xcbc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,4 +261,4 @@ module_exit(crypto_xcbc_module_exit);
261261
MODULE_LICENSE("GPL");
262262
MODULE_DESCRIPTION("XCBC keyed hash algorithm");
263263
MODULE_ALIAS_CRYPTO("xcbc");
264-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
264+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/xctr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,4 +188,4 @@ module_exit(crypto_xctr_module_exit);
188188
MODULE_LICENSE("GPL");
189189
MODULE_DESCRIPTION("XCTR block cipher mode of operation");
190190
MODULE_ALIAS_CRYPTO("xctr");
191-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
191+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");

‎crypto/xts.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,5 +472,5 @@ module_exit(xts_module_exit);
472472
MODULE_LICENSE("GPL");
473473
MODULE_DESCRIPTION("XTS block cipher mode");
474474
MODULE_ALIAS_CRYPTO("xts");
475-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
475+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");
476476
MODULE_SOFTDEP("pre: ecb");

‎drivers/accel/habanalabs/common/memory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/vmalloc.h>
1515
#include <linux/pci-p2pdma.h>
1616

17-
MODULE_IMPORT_NS(DMA_BUF);
17+
MODULE_IMPORT_NS("DMA_BUF");
1818

1919
#define HL_MMU_DEBUG 0
2020

‎drivers/accel/qaic/qaic_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "qaic_timesync.h"
3333
#include "sahara.h"
3434

35-
MODULE_IMPORT_NS(DMA_BUF);
35+
MODULE_IMPORT_NS("DMA_BUF");
3636

3737
#define PCI_DEV_AIC080 0xa080
3838
#define PCI_DEV_AIC100 0xa100

‎drivers/acpi/apei/einj-cxl.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ int einj_cxl_available_error_type_show(struct seq_file *m, void *v)
4545

4646
return 0;
4747
}
48-
EXPORT_SYMBOL_NS_GPL(einj_cxl_available_error_type_show, CXL);
48+
EXPORT_SYMBOL_NS_GPL(einj_cxl_available_error_type_show, "CXL");
4949

5050
static int cxl_dport_get_sbdf(struct pci_dev *dport_dev, u64 *sbdf)
5151
{
@@ -83,7 +83,7 @@ int einj_cxl_inject_rch_error(u64 rcrb, u64 type)
8383
return einj_cxl_rch_error_inject(type, 0x2, rcrb, GENMASK_ULL(63, 0),
8484
0, 0);
8585
}
86-
EXPORT_SYMBOL_NS_GPL(einj_cxl_inject_rch_error, CXL);
86+
EXPORT_SYMBOL_NS_GPL(einj_cxl_inject_rch_error, "CXL");
8787

8888
int einj_cxl_inject_error(struct pci_dev *dport, u64 type)
8989
{
@@ -104,10 +104,10 @@ int einj_cxl_inject_error(struct pci_dev *dport, u64 type)
104104

105105
return einj_error_inject(type, 0x4, 0, 0, 0, param4);
106106
}
107-
EXPORT_SYMBOL_NS_GPL(einj_cxl_inject_error, CXL);
107+
EXPORT_SYMBOL_NS_GPL(einj_cxl_inject_error, "CXL");
108108

109109
bool einj_cxl_is_initialized(void)
110110
{
111111
return einj_initialized;
112112
}
113-
EXPORT_SYMBOL_NS_GPL(einj_cxl_is_initialized, CXL);
113+
EXPORT_SYMBOL_NS_GPL(einj_cxl_is_initialized, "CXL");

‎drivers/acpi/apei/ghes.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ int cxl_cper_register_work(struct work_struct *work)
726726
cxl_cper_work = work;
727727
return 0;
728728
}
729-
EXPORT_SYMBOL_NS_GPL(cxl_cper_register_work, CXL);
729+
EXPORT_SYMBOL_NS_GPL(cxl_cper_register_work, "CXL");
730730

731731
int cxl_cper_unregister_work(struct work_struct *work)
732732
{
@@ -737,13 +737,13 @@ int cxl_cper_unregister_work(struct work_struct *work)
737737
cxl_cper_work = NULL;
738738
return 0;
739739
}
740-
EXPORT_SYMBOL_NS_GPL(cxl_cper_unregister_work, CXL);
740+
EXPORT_SYMBOL_NS_GPL(cxl_cper_unregister_work, "CXL");
741741

742742
int cxl_cper_kfifo_get(struct cxl_cper_work_data *wd)
743743
{
744744
return kfifo_get(&cxl_cper_fifo, wd);
745745
}
746-
EXPORT_SYMBOL_NS_GPL(cxl_cper_kfifo_get, CXL);
746+
EXPORT_SYMBOL_NS_GPL(cxl_cper_kfifo_get, "CXL");
747747

748748
static bool ghes_do_proc(struct ghes *ghes,
749749
const struct acpi_hest_generic_status *estatus)

‎drivers/acpi/numa/hmat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ int acpi_get_genport_coordinates(u32 uid,
151151

152152
return 0;
153153
}
154-
EXPORT_SYMBOL_NS_GPL(acpi_get_genport_coordinates, CXL);
154+
EXPORT_SYMBOL_NS_GPL(acpi_get_genport_coordinates, "CXL");
155155

156156
static __init void alloc_memory_initiator(unsigned int cpu_pxm)
157157
{

‎drivers/acpi/thermal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ static void __exit acpi_thermal_exit(void)
10821082
module_init(acpi_thermal_init);
10831083
module_exit(acpi_thermal_exit);
10841084

1085-
MODULE_IMPORT_NS(ACPI_THERMAL);
1085+
MODULE_IMPORT_NS("ACPI_THERMAL");
10861086
MODULE_AUTHOR("Paul Diefenbaugh");
10871087
MODULE_DESCRIPTION("ACPI Thermal Zone Driver");
10881088
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)