summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2016-07-19 17:42:43 +0300
committerIngo Molnar <mingo@kernel.org>2016-07-20 10:39:50 +0300
commita47177d360a22ddaa7584186e7e1c74e49220bbe (patch)
tree78f63f2b2cd95fd8ff78e6db675240f5bf3f973c /arch
parentf6329088b3d9898d6212c410d465d096cdcd3746 (diff)
downloadlinux-a47177d360a22ddaa7584186e7e1c74e49220bbe.tar.xz
x86, crypto: Restore MODULE_LICENSE() to glue_helper.c so it loads
In commit: eb008eb6f8b6 ("x86: Audit and remove any remaining unnecessary uses of module.h") ... we looked for instances of module.h that were not supporting anything more than exported symbols. To facilitate the exchange of module.h to the much smaller export.h we occasionally remove tags like MODULE_AUTHOR() etc. which in the case of built in files, are no-ops and hence that is fine, assuming the info is already in the comments at the top of the file.. However the error here is that I overlooked that this file was used not as a driver, but as a library of functions, and hence has no explicit modular linkage functions or similar, making it _appear_ non-modular. We can see that in retrospect with: arch/x86/crypto/Makefile:obj-$(CONFIG_CRYPTO_GLUE_HELPER_X86) += glue_helper.o crypto/Kconfig:config CRYPTO_GLUE_HELPER_X86 crypto/Kconfig: tristate Since we removed what was an active MODULE_LICENSE(), the module failed to load and then automated testing showed the missing glue helpers as: glue_helper: Unknown symbol blkcipher_walk_done (err 0) glue_helper: Unknown symbol blkcipher_walk_virt (err 0) glue_helper: Unknown symbol kernel_fpu_end (err 0) glue_helper: Unknown symbol kernel_fpu_begin (err 0) glue_helper: Unknown symbol blkcipher_walk_virt_block (err 0) So we do a partial revert of that change to just this one file, and watch for similar MODULE_LICENSE() only cases in future audits. Reported-by: kernel test robot <xiaolong.ye@intel.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: David S. Miller <davem@davemloft.net> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-crypto@vger.kernel.org Cc: lkp@01.org Fixes: eb008eb6f8b6 ("x86: Audit and remove any remaining unnecessary uses of module.h") Link: http://lkml.kernel.org/r/20160719144243.GK21225@windriver.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/crypto/glue_helper.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/crypto/glue_helper.c b/arch/x86/crypto/glue_helper.c
index 3cc4cad4c363..6a85598931b5 100644
--- a/arch/x86/crypto/glue_helper.c
+++ b/arch/x86/crypto/glue_helper.c
@@ -25,7 +25,7 @@
*
*/
-#include <linux/export.h>
+#include <linux/module.h>
#include <crypto/b128ops.h>
#include <crypto/lrw.h>
#include <crypto/xts.h>
@@ -397,3 +397,5 @@ void glue_xts_crypt_128bit_one(void *ctx, u128 *dst, const u128 *src, le128 *iv,
u128_xor(dst, dst, (u128 *)&ivblk);
}
EXPORT_SYMBOL_GPL(glue_xts_crypt_128bit_one);
+
+MODULE_LICENSE("GPL");