ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

oops, don't hold mycpu() result across intr_off()

Browse source
This commit is contained in:
Robert Morris 2019-07-01 14:15:18 -04:00 committed by Frans Kaashoek
parent 2c0338fe42
commit 535ac52efa
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kernel/spinlock.c
View file

@ -87,13 +87,12 @@ holding(struct spinlock *lk)
void void
push_off(void) push_off(void)
{ {
struct cpu *c = mycpu();
int old = intr_get(); int old = intr_get();
intr_off(); intr_off();
if(c->noff == 0) if(mycpu()->noff == 0)
c->intena = old; mycpu()->intena = old;
c->noff += 1; mycpu()->noff += 1;
} }
void void