60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
From 14d9f1f7f3709199ded0f3b29125943b3eaca0ab Mon Sep 17 00:00:00 2001
|
|
From: Adam Borowski <kilobyte@angband.pl>
|
|
Date: Tue, 29 Nov 2016 14:51:17 +0100
|
|
Subject: x86/kbuild: enable modversions for symbols exported from asm
|
|
|
|
Commit 4efca4ed ("kbuild: modversions for EXPORT_SYMBOL() for asm") adds
|
|
modversion support for symbols exported from asm files. Architectures
|
|
must include C-style declarations for those symbols in asm/asm-prototypes.h
|
|
in order for them to be versioned.
|
|
|
|
Add these declarations for x86, and an architecture-independent file that
|
|
can be used for common symbols.
|
|
|
|
User impact: kernels may fail to load modules at all when
|
|
CONFIG_MODVERSIONS=y.
|
|
|
|
Signed-off-by: Adam Borowski <kilobyte@angband.pl>
|
|
Tested-by: Kalle Valo <kvalo@codeaurora.org>
|
|
Acked-by: Nicholas Piggin <npiggin@gmail.com>
|
|
Tested-by: Peter Wu <peter@lekensteyn.nl>
|
|
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
|
|
---
|
|
arch/x86/include/asm/asm-prototypes.h | 12 ++++++++++++
|
|
include/asm-generic/asm-prototypes.h | 7 +++++++
|
|
2 files changed, 19 insertions(+)
|
|
create mode 100644 arch/x86/include/asm/asm-prototypes.h
|
|
create mode 100644 include/asm-generic/asm-prototypes.h
|
|
|
|
diff --git a/arch/x86/include/asm/asm-prototypes.h b/arch/x86/include/asm/asm-prototypes.h
|
|
new file mode 100644
|
|
index 000000000000..ae87224df613
|
|
--- /dev/null
|
|
+++ b/arch/x86/include/asm/asm-prototypes.h
|
|
@@ -0,0 +1,12 @@
|
|
+#include <asm/ftrace.h>
|
|
+#include <asm/uaccess.h>
|
|
+#include <asm/string.h>
|
|
+#include <asm/page.h>
|
|
+#include <asm/checksum.h>
|
|
+
|
|
+#include <asm-generic/asm-prototypes.h>
|
|
+
|
|
+#include <asm/page.h>
|
|
+#include <asm/pgtable.h>
|
|
+#include <asm/special_insns.h>
|
|
+#include <asm/preempt.h>
|
|
diff --git a/include/asm-generic/asm-prototypes.h b/include/asm-generic/asm-prototypes.h
|
|
new file mode 100644
|
|
index 000000000000..df13637e4017
|
|
--- /dev/null
|
|
+++ b/include/asm-generic/asm-prototypes.h
|
|
@@ -0,0 +1,7 @@
|
|
+#include <linux/bitops.h>
|
|
+extern void *__memset(void *, int, __kernel_size_t);
|
|
+extern void *__memcpy(void *, const void *, __kernel_size_t);
|
|
+extern void *__memmove(void *, const void *, __kernel_size_t);
|
|
+extern void *memset(void *, int, __kernel_size_t);
|
|
+extern void *memcpy(void *, const void *, __kernel_size_t);
|
|
+extern void *memmove(void *, const void *, __kernel_size_t);
|