From f9accfb8ffbeca410ad6bea3858879ffe18ec75e Mon Sep 17 00:00:00 2001
From: Justinien Bouron <justinien.bouron@epfl.ch>
Date: Sun, 10 Mar 2019 04:23:14 -0700
Subject: [PATCH] Fix compilation failure for CONFIG_SMP=y builds.

---
 minix/include/minix/bitmap.h  | 1 +
 minix/include/minix/driver.h  | 2 +-
 minix/include/minix/drivers.h | 2 +-
 minix/kernel/spinlock.h       | 2 +-
 minix/kernel/type.h           | 2 ++
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/minix/include/minix/bitmap.h b/minix/include/minix/bitmap.h
index 2c675e3d5..0d68f757d 100644
--- a/minix/include/minix/bitmap.h
+++ b/minix/include/minix/bitmap.h
@@ -19,6 +19,7 @@
 
 #if defined(CONFIG_SMP) && defined(__GNUC__)
 #ifndef __ASSEMBLY__
+typedef unsigned int bitchunk_t;
 static inline void bits_fill(bitchunk_t * chunks, unsigned bits)
 {
 	unsigned c, cnt;
diff --git a/minix/include/minix/driver.h b/minix/include/minix/driver.h
index 2995fef45..f752b6ccc 100644
--- a/minix/include/minix/driver.h
+++ b/minix/include/minix/driver.h
@@ -9,6 +9,7 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>	/* MUST be first */
+#include <limits.h>
 #include <minix/type.h>
 #include <minix/ipc.h>
 #include <minix/com.h>
@@ -19,7 +20,6 @@
 #include <minix/sysutil.h>
 #include <minix/endpoint.h>
 #include <string.h>
-#include <limits.h>
 #include <stddef.h>
 #include <errno.h>
 #include <sys/param.h>
diff --git a/minix/include/minix/drivers.h b/minix/include/minix/drivers.h
index da94fef14..92be5752e 100644
--- a/minix/include/minix/drivers.h
+++ b/minix/include/minix/drivers.h
@@ -11,6 +11,7 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>	/* MUST be first */
+#include <limits.h>
 #include <minix/bitmap.h>
 #include <minix/callnr.h>
 #include <minix/com.h>
@@ -34,7 +35,6 @@
 
 #include <errno.h>
 #include <lib.h>
-#include <limits.h>
 #include <signal.h>
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/minix/kernel/spinlock.h b/minix/kernel/spinlock.h
index 7cfee2d9e..335c67f61 100644
--- a/minix/kernel/spinlock.h
+++ b/minix/kernel/spinlock.h
@@ -1,7 +1,7 @@
 #ifndef __SPINLOCK_H__
 #define __SPINLOCK_H__
 
-#include "kernel/kernel.h"
+#include <machine/archtypes.h>
 
 typedef struct spinlock {
 	atomic_t val;
diff --git a/minix/kernel/type.h b/minix/kernel/type.h
index 4c45bcf65..17aed29f1 100644
--- a/minix/kernel/type.h
+++ b/minix/kernel/type.h
@@ -5,6 +5,8 @@
 #include <machine/interrupt.h>
 #include <machine/multiboot.h>
 
+typedef uint32_t bitchunk_t;
+
 /* Process table and system property related types. */ 
 typedef int proc_nr_t;			/* process table entry number */
 typedef short sys_id_t;			/* system process index */