From: Thomas Cort <tcort@minix3.org>
Date: Fri, 11 Oct 2013 02:07:12 +0000 (+0000)
Subject: smp: build fixes for CONFIG_SMP=y
X-Git-Tag: v3.3.0~753
X-Git-Url: http://zhaoyanbai.com/repos/COPYRIGHT?a=commitdiff_plain;h=4890bd9dcee8858c0720cf4d3ae204b98a9ce566;p=minix.git

smp: build fixes for CONFIG_SMP=y

 * bitmap.h: declare an explicit return type for bits_fill().
 * arch_smp.c: update include clock.h to kernel/clock.h

Change-Id: Idea373fa4eaa53f8ce4ac4fc3ad56f9f1ca86bc7
---

diff --git a/include/minix/bitmap.h b/include/minix/bitmap.h
index 7a4b74a9a..2c675e3d5 100644
--- a/include/minix/bitmap.h
+++ b/include/minix/bitmap.h
@@ -19,7 +19,7 @@
 
 #if defined(CONFIG_SMP) && defined(__GNUC__)
 #ifndef __ASSEMBLY__
-static inline bits_fill(bitchunk_t * chunks, unsigned bits)
+static inline void bits_fill(bitchunk_t * chunks, unsigned bits)
 {
 	unsigned c, cnt;
 
diff --git a/kernel/arch/i386/arch_smp.c b/kernel/arch/i386/arch_smp.c
index bc27ac595..1b1d0ab9e 100644
--- a/kernel/arch/i386/arch_smp.c
+++ b/kernel/arch/i386/arch_smp.c
@@ -22,7 +22,7 @@
 #include "kernel/smp.h"
 #include "apic.h"
 #include "acpi.h"
-#include "clock.h"
+#include "kernel/clock.h"
 
 #include "glo.h"