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 7a4b74a9aba67901824afa2d44933f7dd123a893..2c675e3d5475e10152a31acb82a679b83d2126d6 100644 (file)
--- 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 bc27ac5958960e0d8daf6f82253d7e24eb573c67..1b1d0ab9e516aeb746394d62585647d834e623a8 100644 (file)
--- 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"