Cleanly split Linux proc.h (fs) from conflicting Solaris proc.h (process)

Under linux the proc.h header is for the /proc filesystem, and under
Solaris the proc/h header if for processes.  This patch correctly
moves the Linux proc functionality in a linux/proc_compat.h header
and leaves the sys/proc.h for use by Solaris.  Minor updates were
required to all the call sites where it was included of course.
This commit is contained in:
Brian Behlendorf
2010-06-11 14:37:46 -07:00
parent 71b1242e67
commit ae4c36adce
12 changed files with 71 additions and 44 deletions
+1 -1
View File
@@ -34,8 +34,8 @@
#include <linux/hardirq.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/proc_compat.h>
#include <sys/sysmacros.h>
#include <sys/proc.h>
#include <sys/debug.h>
#include <spl-ctl.h>
+2 -1
View File
@@ -38,6 +38,7 @@
#include <sys/utsname.h>
#include <sys/file.h>
#include <linux/kmod.h>
#include <linux/proc_compat.h>
#ifdef DEBUG_SUBSYSTEM
#undef DEBUG_SUBSYSTEM
@@ -53,7 +54,7 @@ EXPORT_SYMBOL(spl_hostid);
char hw_serial[HW_HOSTID_LEN] = "<none>";
EXPORT_SYMBOL(hw_serial);
int p0 = 0;
proc_t p0 = { 0 };
EXPORT_SYMBOL(p0);
#ifndef HAVE_KALLSYMS_LOOKUP_NAME
+1
View File
@@ -25,6 +25,7 @@
\*****************************************************************************/
#include <sys/kstat.h>
#include <linux/seq_file.h>
static spinlock_t kstat_lock;
static struct list_head kstat_list;
+5 -1
View File
@@ -24,7 +24,11 @@
* Solaris Porting Layer (SPL) Proc Implementation.
\*****************************************************************************/
#include <sys/proc.h>
#include <sys/systeminfo.h>
#include <sys/kstat.h>
#include <linux/kmod.h>
#include <linux/seq_file.h>
#include <linux/proc_compat.h>
#ifdef DEBUG_SUBSYSTEM
#undef DEBUG_SUBSYSTEM
+1 -1
View File
@@ -83,7 +83,7 @@ EXPORT_SYMBOL(__thread_exit);
* style callers likely never check for... since it can't fail. */
kthread_t *
__thread_create(caddr_t stk, size_t stksize, thread_func_t func,
const char *name, void *args, size_t len, int *pp,
const char *name, void *args, size_t len, proc_t *pp,
int state, pri_t pri)
{
thread_priv_t *tp;