Imported Upstream version 0.6.4.1

[mirror_spl-debian.git] / include / sys / sysmacros.h

diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h
index 04a62b19681aaef386a6c6b65916ab982bdcd06e..c56d7e12a6203051abf79213ac88e49d14f55cac 100644 (file)
--- a/include/sys/sysmacros.h
+++ b/include/sys/sysmacros.h
@@ -6,7 +6,7 @@
  *  UCRL-CODE-235197
  *
  *  This file is part of the SPL, Solaris Porting Layer.
- *  For details, see <http://github.com/behlendorf/spl/>.
+ *  For details, see <http://zfsonlinux.org/>.
  *
  *  The SPL is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -26,12 +26,17 @@
 #define _SPL_SYSMACROS_H
 
 #include <linux/module.h>
+#include <linux/sched.h>
 #include <linux/cpumask.h>
 #include <sys/debug.h>
 #include <sys/varargs.h>
 #include <sys/zone.h>
 #include <sys/signal.h>
 
+#ifdef HAVE_SCHED_RT_HEADER
+#include <linux/sched/rt.h>
+#endif
+
 #ifndef _KERNEL
 #define _KERNEL                                __KERNEL__
 #endif
@@ -90,12 +95,19 @@
 #define minclsyspri                    (MAX_RT_PRIO)
 #define maxclsyspri                    (MAX_PRIO-1)
 
+#ifndef NICE_TO_PRIO
 #define NICE_TO_PRIO(nice)             (MAX_RT_PRIO + (nice) + 20)
+#endif
+#ifndef PRIO_TO_NICE
 #define PRIO_TO_NICE(prio)             ((prio) - MAX_RT_PRIO - 20)
+#endif
 
-/* Missing macros
+/*
+ * Missing macros
  */
+#ifndef PAGESIZE
 #define PAGESIZE                       PAGE_SIZE
+#endif
 
 /* from Solaris sys/byteorder.h */
 #define BSWAP_8(x)     ((x) & 0xff)
@@ -138,15 +150,14 @@
 /* Missing globals */
 extern char spl_version[32];
 extern unsigned long spl_hostid;
-extern char hw_serial[11];
 
 /* Missing misc functions */
-extern int highbit(unsigned long i);
 extern uint32_t zone_get_hostid(void *zone);
 extern void spl_setup(void);
 extern void spl_cleanup(void);
 
-#define makedevice(maj,min) makedev(maj,min)
+#define        highbit64(x)            fls64(x)
+#define        makedevice(maj,min)     makedev(maj,min)
 
 /* common macros */
 #ifndef MIN
@@ -164,6 +175,9 @@ extern void spl_cleanup(void);
 #ifndef roundup
 #define roundup(x, y)          ((((x) + ((y) - 1)) / (y)) * (y))
 #endif
+#ifndef howmany
+#define howmany(x, y)          (((x) + ((y) - 1)) / (y))
+#endif
 
 /*
  * Compatibility macros/typedefs needed for Solaris -> Linux port