diff --git a/src/cpu/x86/lapic/lapic.c b/src/cpu/x86/lapic/lapic.c
index 04ce2261de..988d664c94 100644
--- a/src/cpu/x86/lapic/lapic.c
+++ b/src/cpu/x86/lapic/lapic.c
@@ -3,7 +3,7 @@
 #include <cpu/x86/lapic.h>
 #include <console/console.h>
 
-void do_lapic_init(void)
+void lapic_virtual_wire_mode_init(void)
 {
 	/* this is so interrupts work. This is very limited scope --
 	 * linux will do better later, we hope ...
diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h
index 5ab57554f2..f4291ab35b 100644
--- a/src/include/cpu/x86/lapic.h
+++ b/src/include/cpu/x86/lapic.h
@@ -73,7 +73,7 @@ static inline void lapic_write_atomic(unsigned long reg, uint32_t v)
 # define lapic_read_around(x) lapic_read(x)
 # define lapic_write_around(x, y) lapic_write_atomic((x), (y))
 
-void do_lapic_init(void);
+void lapic_virtual_wire_mode_init(void);
 
 /* See if I need to initialize the local APIC */
 static inline int need_lapic_init(void)
@@ -84,7 +84,7 @@ static inline int need_lapic_init(void)
 static inline void setup_lapic(void)
 {
 	if (need_lapic_init())
-		do_lapic_init();
+		lapic_virtual_wire_mode_init();
 	else
 		disable_lapic();
 }