From b89b5d3826cd16570d24f6fa29d0ccaa2843d0dd Mon Sep 17 00:00:00 2001
From: Pawel Dziepak <pdziepak@quarnos.org>
Date: Fri, 20 Dec 2013 22:05:26 +0100
Subject: [PATCH] x86: Make arch/smp.h a C++ only header

---
 headers/private/kernel/arch/smp.h              | 13 ++++---------
 src/system/kernel/arch/x86/timers/x86_apic.cpp |  1 -
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/headers/private/kernel/arch/smp.h b/headers/private/kernel/arch/smp.h
index 440617bd1a..4b59e45041 100644
--- a/headers/private/kernel/arch/smp.h
+++ b/headers/private/kernel/arch/smp.h
@@ -8,23 +8,18 @@
 
 #include <kernel.h>
 
+
 struct kernel_args;
 
 class CPUSet;
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+status_t arch_smp_init(kernel_args* args);
+status_t arch_smp_per_cpu_init(kernel_args* args, int32 cpu);
 
-status_t arch_smp_init(struct kernel_args *args);
-status_t arch_smp_per_cpu_init(struct kernel_args *args, int32 cpu);
 void arch_smp_send_ici(int32 target_cpu);
-void arch_smp_send_broadcast_ici(void);
+void arch_smp_send_broadcast_ici();
 void arch_smp_send_multicast_ici(CPUSet& cpuSet);
 
-#ifdef __cplusplus
-}
-#endif
 
 #endif	/* KERNEL_ARCH_SMP_H */
diff --git a/src/system/kernel/arch/x86/timers/x86_apic.cpp b/src/system/kernel/arch/x86/timers/x86_apic.cpp
index 6ac3e5947f..568cd65244 100644
--- a/src/system/kernel/arch/x86/timers/x86_apic.cpp
+++ b/src/system/kernel/arch/x86/timers/x86_apic.cpp
@@ -14,7 +14,6 @@
 #include <arch/x86/apic.h>
 
 #include <arch/cpu.h>
-#include <arch/smp.h>
 
 #include "apic_timer.h"