Index: kernel/arch/amd64/src/debugger.c
===================================================================
--- kernel/arch/amd64/src/debugger.c	(revision dabdd1aaada964f4510bd352506e4f47c078c88d)
+++ kernel/arch/amd64/src/debugger.c	(revision 26d3ae2d56cbdf7eaecdc582b53cef8f6ebf6f7c)
@@ -201,7 +201,5 @@
 
 	/* Send IPI */
-#ifdef CONFIG_SMP
 //	ipi_broadcast(VECTOR_DEBUG_IPI);
-#endif	
 
 	return curidx;
@@ -262,7 +260,5 @@
 	spinlock_unlock(&bkpoint_lock);
 	interrupts_restore(ipl);
-#ifdef CONFIG_SMP
-//	ipi_broadcast(VECTOR_DEBUG_IPI);	
-#endif
+//	ipi_broadcast(VECTOR_DEBUG_IPI);
 }
 
Index: kernel/arch/mips32/include/smp/dorder.h
===================================================================
--- kernel/arch/mips32/include/smp/dorder.h	(revision dabdd1aaada964f4510bd352506e4f47c078c88d)
+++ 	(revision )
@@ -1,34 +1,0 @@
-/*
- * Copyright (c) 2007 Martin Decky
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef KERN_mips32_DORDER_H_
-#define KERN_mips32_DORDER_H_
-
-extern void ipi_broadcast_arch(int ipi);
-
-#endif
Index: kernel/arch/mips32/src/smp/dorder.c
===================================================================
--- kernel/arch/mips32/src/smp/dorder.c	(revision dabdd1aaada964f4510bd352506e4f47c078c88d)
+++ kernel/arch/mips32/src/smp/dorder.c	(revision 26d3ae2d56cbdf7eaecdc582b53cef8f6ebf6f7c)
@@ -33,5 +33,7 @@
  */
 
-#include <arch/smp/dorder.h>
+#include <smp/ipi.h>
+
+#ifdef CONFIG_SMP
 
 #define MSIM_DORDER_ADDRESS  0xB0000004
@@ -39,8 +41,8 @@
 void ipi_broadcast_arch(int ipi)
 {
-#ifdef CONFIG_SMP
 	*((volatile unsigned int *) MSIM_DORDER_ADDRESS) = 0x7FFFFFFF;
+}
+
 #endif
-}
 
 /** @}