1 files changed, 5 insertions, 5 deletions
diff --git a/lapic.c b/lapic.c
index 4bc3e7c..915765a 100644
--- a/lapic.c
+++ b/lapic.c
@@ -46,7 +46,7 @@ lapicw(int index, int value)
 
 //PAGEBREAK!
 void
-lapic_init(int c)
+lapicinit(int c)
 {
   if(!lapic) 
     return;
@@ -99,11 +99,11 @@ cpu(void)
   // Would prefer to panic but even printing is chancy here:
   // almost everything, including cprintf and panic, calls cpu,
   // often indirectly through acquire and release.
-  if(read_eflags()&FL_IF){
+  if(readeflags()&FL_IF){
     static int n;
     if(n++ == 0)
       cprintf("cpu called from %x with interrupts enabled\n",
-        ((uint*)read_ebp())[1]);
+        __builtin_return_address(0));
   }
 
   if(lapic)
@@ -113,7 +113,7 @@ cpu(void)
 
 // Acknowledge interrupt.
 void
-lapic_eoi(void)
+lapiceoi(void)
 {
   if(lapic)
     lapicw(EOI, 0);
@@ -136,7 +136,7 @@ microdelay(int us)
 // Start additional processor running bootstrap code at addr.
 // See Appendix B of MultiProcessor Specification.
 void
-lapic_startap(uchar apicid, uint addr)
+lapicstartap(uchar apicid, uint addr)
 {
   int i;
   ushort *wrv;