scripts: Merge r5177:5337 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@5373 d57e44dd-8a1f-0410-8b47-8ef2f437770f

scripts/kernel-functions

@@ -174,6 +174,47 @@ Get rid of sparse errors on sk_buff.protocol.
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
 EOF
     fi
+    if [ "${1#3.13}" != "$1" ]; then
+      if [ "$1" = "3.13" ] || [ "${1#3.13.}" -lt 6 ]; then
+        patch -f -s -p1 <<'EOF'
+From 7b4ec8dd7d4ac467e9eee4d49f2c9574d773efbb Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Thu, 16 Jan 2014 10:18:48 +1030
+Subject: [PATCH] export: declare ksymtab symbols
+
+sparse complains about any __ksymtab symbols with the following:
+
+ warning: symbol '__ksymtab_...' was not declared. Should it be static?
+
+due to Andi's patch making it non-static.
+
+Mollify sparse by declaring the symbol extern, otherwise we get
+drowned in sparse warnings for anything that uses EXPORT_SYMBOL
+in the sources, making it easy to miss real warnings.
+
+Fixes: e0f244c63fc9 ("asmlinkage, module: Make ksymtab [...] __visible")
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Acked-by: Andi Kleen <ak@linux.intel.com>
+Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+---
+ include/linux/export.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/linux/export.h b/include/linux/export.h
+index 3f2793d..96e45ea 100644
+--- a/include/linux/export.h
++++ b/include/linux/export.h
+@@ -59,6 +59,7 @@ extern struct module __this_module;
+ 	static const char __kstrtab_##sym[]			\
+ 	__attribute__((section("__ksymtab_strings"), aligned(1))) \
+ 	= VMLINUX_SYMBOL_STR(sym);				\
++	extern const struct kernel_symbol __ksymtab_##sym;	\
+ 	__visible const struct kernel_symbol __ksymtab_##sym	\
+ 	__used							\
+ 	__attribute__((section("___ksymtab" sec "+" #sym), unused))	\
+EOF
+      fi
+    fi
   )
   rmdir "${tmpdir}"
 }