summaryrefslogtreecommitdiff
path: root/lapic.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2017-01-31 17:47:16 -0500
committerFrans Kaashoek <[email protected]>2017-01-31 17:47:16 -0500
commitabf847a083888bbed4260ecacf849ea19f23e810 (patch)
tree4ae9b3487bbfe27f6382486bf877917dbb8bc030 /lapic.c
parent59cdd6c63b89395d64ec9550181af5ed569b8466 (diff)
downloadxv6-labs-abf847a083888bbed4260ecacf849ea19f23e810.tar.gz
xv6-labs-abf847a083888bbed4260ecacf849ea19f23e810.tar.bz2
xv6-labs-abf847a083888bbed4260ecacf849ea19f23e810.zip
Start of an experiment to remove the use of gs for cpu local variables.
Diffstat (limited to 'lapic.c')
-rw-r--r--lapic.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lapic.c b/lapic.c
index 7507f97..9039665 100644
--- a/lapic.c
+++ b/lapic.c
@@ -99,11 +99,11 @@ lapicinit(void)
}
int
-cpunum(void)
+lapiccpunum(void)
{
int apicid, i;
- // Cannot call cpu when interrupts are enabled:
+ // Cannot call cpunum when interrupts are enabled:
// result not guaranteed to last long enough to be used!
// Would prefer to panic but even printing is chancy here:
// almost everything, including cprintf and panic, calls cpu,
@@ -111,7 +111,7 @@ cpunum(void)
if(readeflags()&FL_IF){
static int n;
if(n++ == 0)
- cprintf("cpu called from %x with interrupts enabled\n",
+ cprintf("cpunum called from %x with interrupts enabled\n",
__builtin_return_address(0));
}