Invert minclsyspri and maxclsyspri

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

diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h
index 7c4da67fc9cab9d3b47bbfd03376cb70caf1bdfd..4dc7cd8585619a77d4405ab15724bb30769e3ce6 100644 (file)
--- a/include/sys/sysmacros.h
+++ b/include/sys/sysmacros.h
@@ -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
@@ -73,6 +78,7 @@
 #define proc_pageout                   NULL
 #define curproc                                current
 #define max_ncpus                      num_possible_cpus()
+#define boot_ncpus                     num_online_cpus()
 #define CPU_SEQID                      smp_processor_id()
 #define _NOTE(x)
 #define is_system_labeled()            0
@@ -87,15 +93,23 @@
  *
  * Treat shim tasks as SCHED_NORMAL tasks
  */
-#define minclsyspri                    (MAX_RT_PRIO)
-#define maxclsyspri                    (MAX_PRIO-1)
+#define minclsyspri                    (MAX_PRIO-1)
+#define maxclsyspri                    (MAX_RT_PRIO)
+#define defclsyspri                    (DEFAULT_PRIO)
 
+#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 +152,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 +177,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