diff options
author | rsc <rsc> | 2009-03-08 22:07:13 +0000 |
---|---|---|
committer | rsc <rsc> | 2009-03-08 22:07:13 +0000 |
commit | 2157576107d6e81c643e14e134b60b8ae519c256 (patch) | |
tree | 88ff770d321b4b2ef1ef1fcc0e17508ede6001bf /lapic.c | |
parent | b7f653dc49dd4af29a3b7bdd66cd712bea166623 (diff) | |
download | xv6-labs-2157576107d6e81c643e14e134b60b8ae519c256.tar.gz xv6-labs-2157576107d6e81c643e14e134b60b8ae519c256.tar.bz2 xv6-labs-2157576107d6e81c643e14e134b60b8ae519c256.zip |
be consistent: no underscores in function names
Diffstat (limited to 'lapic.c')
-rw-r--r-- | lapic.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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; |