UAPI: (Scripted) Disintegrate include/linux/sunrpc

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>

4 files changed, 50 insertions, 39 deletions

diff --git a/include/linux/sunrpc/Kbuild b/include/linux/sunrpc/Kbuild
index 98df21164a86..e69de29bb2d1 100644
--- a/include/linux/sunrpc/Kbuild
+++ b/include/linux/sunrpc/Kbuild
@@ -1 +0,0 @@
-header-y += debug.h
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h
index a76cc20d98ce..9385bd74c860 100644
--- a/include/linux/sunrpc/debug.h
+++ b/include/linux/sunrpc/debug.h
@@ -5,28 +5,11 @@
  *
  * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
  */
-
 #ifndef _LINUX_SUNRPC_DEBUG_H_
 #define _LINUX_SUNRPC_DEBUG_H_
 
-/*
- * RPC debug facilities
- */
-#define RPCDBG_XPRT             0x0001
-#define RPCDBG_CALL             0x0002
-#define RPCDBG_DEBUG            0x0004
-#define RPCDBG_NFS              0x0008
-#define RPCDBG_AUTH             0x0010
-#define RPCDBG_BIND             0x0020
-#define RPCDBG_SCHED            0x0040
-#define RPCDBG_TRANS            0x0080
-#define RPCDBG_SVCXPRT          0x0100
-#define RPCDBG_SVCDSP           0x0200
-#define RPCDBG_MISC             0x0400
-#define RPCDBG_CACHE            0x0800
-#define RPCDBG_ALL              0x7fff
+#include <uapi/linux/sunrpc/debug.h>
 
-#ifdef __KERNEL__
 
 /*
  * Enable RPC debugging/profiling.
@@ -87,24 +70,4 @@ void		rpc_register_sysctl(void);
 void            rpc_unregister_sysctl(void);
 #endif
 
-#endif /* __KERNEL__ */
-
-/*
- * Declarations for the sysctl debug interface, which allows to read or
- * change the debug flags for rpc, nfs, nfsd, and lockd. Since the sunrpc
- * module currently registers its sysctl table dynamically, the sysctl path
- * for module FOO is <CTL_SUNRPC, CTL_FOODEBUG>.
- */
-
-enum {
-        CTL_RPCDEBUG = 1,
-        CTL_NFSDEBUG,
-        CTL_NFSDDEBUG,
-        CTL_NLMDEBUG,
-        CTL_SLOTTABLE_UDP,
-        CTL_SLOTTABLE_TCP,
-        CTL_MIN_RESVPORT,
-        CTL_MAX_RESVPORT,
-};
-
 #endif /* _LINUX_SUNRPC_DEBUG_H_ */
diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild
index aafaa5aa54d4..8e02e47c20fb 100644
--- a/include/uapi/linux/sunrpc/Kbuild
+++ b/include/uapi/linux/sunrpc/Kbuild
@@ -1 +1,2 @@
 # UAPI Header export list
+header-y += debug.h
diff --git a/include/uapi/linux/sunrpc/debug.h b/include/uapi/linux/sunrpc/debug.h
new file mode 100644
index 000000000000..830e34493a8c
--- /dev/null
+++ b/include/uapi/linux/sunrpc/debug.h
@@ -0,0 +1,48 @@
+/*
+ * linux/include/linux/sunrpc/debug.h
+ *
+ * Debugging support for sunrpc module
+ *
+ * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
+ */
+
+#ifndef _UAPI_LINUX_SUNRPC_DEBUG_H_
+#define _UAPI_LINUX_SUNRPC_DEBUG_H_
+
+/*
+ * RPC debug facilities
+ */
+#define RPCDBG_XPRT             0x0001
+#define RPCDBG_CALL             0x0002
+#define RPCDBG_DEBUG            0x0004
+#define RPCDBG_NFS              0x0008
+#define RPCDBG_AUTH             0x0010
+#define RPCDBG_BIND             0x0020
+#define RPCDBG_SCHED            0x0040
+#define RPCDBG_TRANS            0x0080
+#define RPCDBG_SVCXPRT          0x0100
+#define RPCDBG_SVCDSP           0x0200
+#define RPCDBG_MISC             0x0400
+#define RPCDBG_CACHE            0x0800
+#define RPCDBG_ALL              0x7fff
+
+
+/*
+ * Declarations for the sysctl debug interface, which allows to read or
+ * change the debug flags for rpc, nfs, nfsd, and lockd. Since the sunrpc
+ * module currently registers its sysctl table dynamically, the sysctl path
+ * for module FOO is <CTL_SUNRPC, CTL_FOODEBUG>.
+ */
+
+enum {
+        CTL_RPCDEBUG = 1,
+        CTL_NFSDEBUG,
+        CTL_NFSDDEBUG,
+        CTL_NLMDEBUG,
+        CTL_SLOTTABLE_UDP,
+        CTL_SLOTTABLE_TCP,
+        CTL_MIN_RESVPORT,
+        CTL_MAX_RESVPORT,
+};
+
+#endif /* _UAPI_LINUX_SUNRPC_DEBUG_H_ */