diff options
| author | Brian Behlendorf <[email protected]> | 2010-06-11 14:37:46 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2010-06-11 15:57:25 -0700 |
| commit | ae4c36adce9228eb444c1d5e19f00e83303dbeee (patch) | |
| tree | ae66b580d1d87436790ade78bd895bcc254459ce /include/sys/sysmacros.h | |
| parent | 71b1242e677d1e44d9273f9bbe1206a2184eabf8 (diff) | |
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.
Diffstat (limited to 'include/sys/sysmacros.h')
| -rw-r--r-- | include/sys/sysmacros.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h index f76c6dd7f..4475431e7 100644 --- a/include/sys/sysmacros.h +++ b/include/sys/sysmacros.h @@ -64,11 +64,12 @@ #define DEV_BSIZE 512 #define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */ -#define curproc current #define proc_pageout NULL -#define max_ncpus 64 +#define curproc get_current() +#define max_ncpus 64 #define CPU_SEQID smp_processor_id() /* I think... */ #define _NOTE(x) +#define is_system_labeled() 0 #define RLIM64_INFINITY RLIM_INFINITY @@ -131,7 +132,6 @@ extern char spl_version[16]; extern long spl_hostid; extern char hw_serial[11]; -extern int p0; /* Missing misc functions */ extern int highbit(unsigned long i); |