diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-10-26 15:08:03 +0200 |
|---|---|---|
| committer | Keith Busch <kbusch@kernel.org> | 2023-11-07 10:05:15 -0800 |
| commit | 6affe08aea5f3b630565676e227b41d55a6f009c (patch) | |
| tree | d241517de15d44dfbf2a803c30767e41be90316a /include | |
| parent | 4733b65d82bdb19bca5ba47ff6c9b24bce1b3f9f (diff) | |
| download | lwn-6affe08aea5f3b630565676e227b41d55a6f009c.tar.gz lwn-6affe08aea5f3b630565676e227b41d55a6f009c.zip | |
nvme: common: make keyring and auth separate modules
When only the keyring module is included but auth is not, modpost
complains about the lack of a module license tag:
ERROR: modpost: missing MODULE_LICENSE() in drivers/nvme/common/nvme-common.o
Address this by making both modules buildable standalone,
removing the now unnecessary CONFIG_NVME_COMMON symbol
in the process.
Also, now that NVME_KEYRING config symbol can be either a module or
built-in, the stubs need to check for '#if IS_ENABLED' rather than a
simple '#ifdef'.
Fixes: 9d77eb5277849 ("nvme-keyring: register '.nvme' keyring")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nvme-keyring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nvme-keyring.h b/include/linux/nvme-keyring.h index 4efea9dd967c..6cc0696625f3 100644 --- a/include/linux/nvme-keyring.h +++ b/include/linux/nvme-keyring.h @@ -6,7 +6,7 @@ #ifndef _NVME_KEYRING_H #define _NVME_KEYRING_H -#ifdef CONFIG_NVME_KEYRING +#if IS_ENABLED(CONFIG_NVME_KEYRING) key_serial_t nvme_tls_psk_default(struct key *keyring, const char *hostnqn, const char *subnqn); |