4 files changed, 123 insertions, 19 deletions

diff --git a/include/asm-generic/export.h b/include/asm-generic/export.h
index 63f54907317b..e2b5d0f569d3 100644
--- a/include/asm-generic/export.h
+++ b/include/asm-generic/export.h
@@ -17,11 +17,11 @@
 
 .macro __put, val, name
 #ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS
-        .long   \val - ., \name - .
+        .long   \val - ., \name - ., 0 - .
 #elif defined(CONFIG_64BIT)
-        .quad   \val, \name
+        .quad   \val, \name, 0
 #else
-        .long   \val, \name
+        .long   \val, \name, 0
 #endif
 .endm
 
diff --git a/include/linux/export.h b/include/linux/export.h
index 28a4d2150689..d59461e71478 100644
--- a/include/linux/export.h
+++ b/include/linux/export.h
@@ -20,6 +20,8 @@ extern struct module __this_module;
 
 #ifdef CONFIG_MODULES
 
+#define NS_SEPARATOR "."
+
 #if defined(__KERNEL__) && !defined(__GENKSYMS__)
 #ifdef CONFIG_MODVERSIONS
 /* Mark the CRC weak since genksyms apparently decides not to
@@ -29,13 +31,13 @@ extern struct module __this_module;
         asm("   .section \"___kcrctab" sec "+" #sym "\", \"a\"  \n"     \
             "   .weak   __crc_" #sym "                          \n"     \
             "   .long   __crc_" #sym " - .                      \n"     \
-            "   .previous                                       \n");
+            "   .previous                                       \n")
 #else
 #define __CRC_SYMBOL(sym, sec)                                          \
         asm("   .section \"___kcrctab" sec "+" #sym "\", \"a\"  \n"     \
             "   .weak   __crc_" #sym "                          \n"     \
             "   .long   __crc_" #sym "                          \n"     \
-            "   .previous                                       \n");
+            "   .previous                                       \n")
 #endif
 #else
 #define __CRC_SYMBOL(sym, sec)
@@ -49,6 +51,16 @@ extern struct module __this_module;
  * absolute relocations that require runtime processing on relocatable
  * kernels.
  */
+#define __KSYMTAB_ENTRY_NS(sym, sec, ns)                                \
+        __ADDRESSABLE(sym)                                              \
+        asm("   .section \"___ksymtab" sec "+" #sym "\", \"a\"  \n"     \
+            "   .balign 4                                       \n"     \
+            "__ksymtab_" #sym NS_SEPARATOR #ns ":               \n"     \
+            "   .long   " #sym "- .                             \n"     \
+            "   .long   __kstrtab_" #sym "- .                   \n"     \
+            "   .long   __kstrtab_ns_" #sym "- .                \n"     \
+            "   .previous                                       \n")
+
 #define __KSYMTAB_ENTRY(sym, sec)                                       \
         __ADDRESSABLE(sym)                                              \
         asm("   .section \"___ksymtab" sec "+" #sym "\", \"a\"  \n"     \
@@ -56,32 +68,53 @@ extern struct module __this_module;
             "__ksymtab_" #sym ":                                \n"     \
             "   .long   " #sym "- .                             \n"     \
             "   .long   __kstrtab_" #sym "- .                   \n"     \
+            "   .long   0 - .                                   \n"     \
             "   .previous                                       \n")
 
 struct kernel_symbol {
         int value_offset;
         int name_offset;
+        int namespace_offset;
 };
 #else
+#define __KSYMTAB_ENTRY_NS(sym, sec, ns)                                \
+        static const struct kernel_symbol __ksymtab_##sym##__##ns       \
+        asm("__ksymtab_" #sym NS_SEPARATOR #ns)                         \
+        __attribute__((section("___ksymtab" sec "+" #sym), used))       \
+        __aligned(sizeof(void *))                                       \
+        = { (unsigned long)&sym, __kstrtab_##sym, __kstrtab_ns_##sym }
+
 #define __KSYMTAB_ENTRY(sym, sec)                                       \
         static const struct kernel_symbol __ksymtab_##sym               \
+        asm("__ksymtab_" #sym)                                          \
         __attribute__((section("___ksymtab" sec "+" #sym), used))       \
         __aligned(sizeof(void *))                                       \
-        = { (unsigned long)&sym, __kstrtab_##sym }
+        = { (unsigned long)&sym, __kstrtab_##sym, NULL }
 
 struct kernel_symbol {
         unsigned long value;
         const char *name;
+        const char *namespace;
 };
 #endif
 
-/* For every exported symbol, place a struct in the __ksymtab section */
-#define ___EXPORT_SYMBOL(sym, sec)                                      \
+#define ___export_symbol_common(sym, sec)                               \
         extern typeof(sym) sym;                                         \
-        __CRC_SYMBOL(sym, sec)                                          \
+        __CRC_SYMBOL(sym, sec);                                         \
         static const char __kstrtab_##sym[]                             \
         __attribute__((section("__ksymtab_strings"), used, aligned(1))) \
-        = #sym;                                                         \
+        = #sym                                                          \
+
+/* For every exported symbol, place a struct in the __ksymtab section */
+#define ___EXPORT_SYMBOL_NS(sym, sec, ns)                               \
+        ___export_symbol_common(sym, sec);                              \
+        static const char __kstrtab_ns_##sym[]                          \
+        __attribute__((section("__ksymtab_strings"), used, aligned(1))) \
+        = #ns;                                                          \
+        __KSYMTAB_ENTRY_NS(sym, sec, ns)
+
+#define ___EXPORT_SYMBOL(sym, sec)                                      \
+        ___export_symbol_common(sym, sec);                              \
         __KSYMTAB_ENTRY(sym, sec)
 
 #if defined(__DISABLE_EXPORTS)
@@ -91,6 +124,7 @@ struct kernel_symbol {
  * be reused in other execution contexts such as the UEFI stub or the
  * decompressor.
  */
+#define __EXPORT_SYMBOL_NS(sym, sec, ns)
 #define __EXPORT_SYMBOL(sym, sec)
 
 #elif defined(CONFIG_TRIM_UNUSED_KSYMS)
@@ -117,18 +151,26 @@ struct kernel_symbol {
 #define __cond_export_sym_1(sym, sec) ___EXPORT_SYMBOL(sym, sec)
 #define __cond_export_sym_0(sym, sec) /* nothing */
 
+#define __EXPORT_SYMBOL_NS(sym, sec, ns)                                \
+        __ksym_marker(sym);                                             \
+        __cond_export_ns_sym(sym, sec, ns, __is_defined(__KSYM_##sym))
+#define __cond_export_ns_sym(sym, sec, ns, conf)                        \
+        ___cond_export_ns_sym(sym, sec, ns, conf)
+#define ___cond_export_ns_sym(sym, sec, ns, enabled)                    \
+        __cond_export_ns_sym_##enabled(sym, sec, ns)
+#define __cond_export_ns_sym_1(sym, sec, ns) ___EXPORT_SYMBOL_NS(sym, sec, ns)
+#define __cond_export_ns_sym_0(sym, sec, ns) /* nothing */
+
 #else
+#define __EXPORT_SYMBOL_NS ___EXPORT_SYMBOL_NS
 #define __EXPORT_SYMBOL ___EXPORT_SYMBOL
 #endif
 
-#define EXPORT_SYMBOL(sym)                                      \
-        __EXPORT_SYMBOL(sym, "")
-
-#define EXPORT_SYMBOL_GPL(sym)                                  \
-        __EXPORT_SYMBOL(sym, "_gpl")
-
-#define EXPORT_SYMBOL_GPL_FUTURE(sym)                           \
-        __EXPORT_SYMBOL(sym, "_gpl_future")
+#define EXPORT_SYMBOL(sym) __EXPORT_SYMBOL(sym, "")
+#define EXPORT_SYMBOL_GPL(sym) __EXPORT_SYMBOL(sym, "_gpl")
+#define EXPORT_SYMBOL_GPL_FUTURE(sym) __EXPORT_SYMBOL(sym, "_gpl_future")
+#define EXPORT_SYMBOL_NS(sym, ns) __EXPORT_SYMBOL_NS(sym, "", ns)
+#define EXPORT_SYMBOL_NS_GPL(sym, ns) __EXPORT_SYMBOL_NS(sym, "_gpl", ns)
 
 #ifdef CONFIG_UNUSED_SYMBOLS
 #define EXPORT_UNUSED_SYMBOL(sym) __EXPORT_SYMBOL(sym, "_unused")
@@ -138,11 +180,28 @@ struct kernel_symbol {
 #define EXPORT_UNUSED_SYMBOL_GPL(sym)
 #endif
 
-#endif  /* __GENKSYMS__ */
+#endif  /* __KERNEL__ && !__GENKSYMS__ */
+
+#if defined(__GENKSYMS__)
+/*
+ * When we're running genksyms, ignore the namespace and make the _NS
+ * variants look like the normal ones. There are two reasons for this:
+ * 1) In the normal definition of EXPORT_SYMBOL_NS, the 'ns' macro