From 7df40cdebf91b95041417a50b5297447c693a84c Mon Sep 17 00:00:00 2001
From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Wed, 23 Jan 2013 04:47:21 -0500
Subject: [PATCH] dtrace: move psinfo to its own header file

The psinfo structure definition and related function prototypes have been moved
to their own header file to avoiding including dtrace_os.h in sched.h.  This is
also one step closer to providing the psinfo as a more generic piece of info,
rather than it being dtrace specific.

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
---
 include/linux/dtrace_os.h     | 21 +--------------------
 include/linux/dtrace_psinfo.h | 21 +++++++++++++++++++++
 include/linux/sched.h         |  2 +-
 3 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 include/linux/dtrace_psinfo.h

diff --git a/include/linux/dtrace_os.h b/include/linux/dtrace_os.h
index 070899f02004..c0d0ed33fa3b 100644
--- a/include/linux/dtrace_os.h
+++ b/include/linux/dtrace_os.h
@@ -1,27 +1,10 @@
-/* Copyright (C) 2011 Oracle Corporation */
+/* Copyright (C) 2011, 2012, 2013 Oracle Corporation */
 
 #ifndef _DTRACE_OS_H_
 #define _DTRACE_OS_H_
 
-#define PR_PSARGS_SZ		80
-
-typedef struct dtrace_psinfo {
-	union {
-		unsigned long argc;
-		struct dtrace_psinfo *next;
-	};
-	char **argv;
-	char **envp;
-	char psargs[PR_PSARGS_SZ];
-} dtrace_psinfo_t;
-
-#ifndef COMPILE_OFFSETS
-
 #include <asm/asm-offsets.h>
 
-extern dtrace_psinfo_t *dtrace_psinfo_alloc(struct task_struct *);
-extern void dtrace_psinfo_free(dtrace_psinfo_t *);
-
 typedef uint32_t dtrace_id_t;
 
 #define DTRACE_IDNONE 0
@@ -98,6 +81,4 @@ typedef void		*(fbt_provide_fn)(struct module *, char *, uint8_t,
 
 extern void dtrace_fbt_init(fbt_provide_fn);
 
-#endif /* COMPILE_OFFSETS */
-
 #endif /* _DTRACE_OS_H_ */
diff --git a/include/linux/dtrace_psinfo.h b/include/linux/dtrace_psinfo.h
new file mode 100644
index 000000000000..7c6c6c1723a4
--- /dev/null
+++ b/include/linux/dtrace_psinfo.h
@@ -0,0 +1,21 @@
+/* Copyright (C) 2011, 2012, 2013 Oracle, Inc. */
+
+#ifndef _DTRACE_PSINFO_H_
+#define _DTRACE_PSINFO_H_
+
+#define PR_PSARGS_SZ		80
+
+typedef struct dtrace_psinfo {
+	union {
+		unsigned long argc;
+		struct dtrace_psinfo *next;
+	};
+	char **argv;
+	char **envp;
+	char psargs[PR_PSARGS_SZ];
+} dtrace_psinfo_t;
+
+extern dtrace_psinfo_t *dtrace_psinfo_alloc(struct task_struct *);
+extern void dtrace_psinfo_free(dtrace_psinfo_t *);
+
+#endif /* _DTRACE_PSINFO_H_ */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 51e211a70201..2b89630bbfc4 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -58,7 +58,7 @@ struct sched_param {
 #include <linux/uidgid.h>
 #include <linux/gfp.h>
 #include <linux/magic.h>
-#include <linux/dtrace_os.h>
+#include <linux/dtrace_psinfo.h>
 
 #include <asm/processor.h>
 
-- 
2.50.1