Index: kernel/arch/sparc64/src/smp/sun4u/ipi.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4u/ipi.c	(revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05)
+++ kernel/arch/sparc64/src/smp/sun4u/ipi.c	(revision 1a5fe4f3ec6a76ebd5b30f992574d843540f25cb)
@@ -35,5 +35,4 @@
 #include <smp/ipi.h>
 #include <arch/barrier.h>
-#include <arch/smp/sun4u/ipi.h>
 #include <assert.h>
 #include <cpu.h>
@@ -43,5 +42,4 @@
 #include <config.h>
 #include <mm/tlb.h>
-#include <smp/smp_call.h>
 #include <arch/interrupt.h>
 #include <arch/trap/interrupt.h>
@@ -175,25 +173,4 @@
 }
 
-/*
- * Deliver an IPI to the specified processors (except the current one).
- *
- * Interrupts must be disabled.
- *
- * @param cpu_id Destination cpu id (index into cpus array). Must not
- *               be the current cpu.
- * @param ipi    IPI number.
- */
-void ipi_unicast_arch(unsigned int cpu_id, int ipi)
-{
-	assert(&cpus[cpu_id] != CPU);
-
-	if (ipi == IPI_SMP_CALL) {
-		cross_call(cpus[cpu_id].arch.mid, smp_call_ipi_recv);
-	} else {
-		panic("Unknown IPI (%d).\n", ipi);
-		return;
-	}
-}
-
 /** @}
  */
Index: kernel/arch/sparc64/src/smp/sun4u/smp_call.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4u/smp_call.c	(revision 6f7071b562c845499c96c4a1354e9a5d3ce94a05)
+++ 	(revision )
@@ -1,55 +1,0 @@
-/*
- * Copyright (c) 2012 Adam Hraska
- * 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.
- */
-
-/** @addtogroup kernel_sparc64
- * @{
- */
-
-/**
- * @file
- * @brief Sun4u specific smp call support.
- */
-
-#include <smp/smp_call.h>
-#include <arch/smp/sun4u/ipi.h>
-#include <arch/interrupt.h>
-
-void arch_smp_call_ipi(unsigned int cpu_id)
-{
-	/*
-	 * Required by ipi_unicast_arch(). That functions resolves a potential
-	 * deadlock should both the destination and source cpus be sending
-	 * unicast ipis to each other with interrupts disabled.
-	 */
-	ipl_t ipl = interrupts_disable();
-	ipi_unicast_arch(cpu_id, IPI_SMP_CALL);
-	interrupts_restore(ipl);
-}
-
-/** @}
- */