summaryrefslogtreecommitdiff
path: root/kernel/kalloc.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2019-07-11 05:41:59 -0400
committerRobert Morris <[email protected]>2019-07-11 05:41:59 -0400
commit7797a384236cee31b924d27d8f814ef9543662cd (patch)
treec6222d9a40f9ce0bc9f589525d33e882f1670a6b /kernel/kalloc.c
parent4bc900e78bdbff3ba22ccccd26833cf70fd300b1 (diff)
downloadxv6-labs-7797a384236cee31b924d27d8f814ef9543662cd.tar.gz
xv6-labs-7797a384236cee31b924d27d8f814ef9543662cd.tar.bz2
xv6-labs-7797a384236cee31b924d27d8f814ef9543662cd.zip
another test, to help with locking exercises
Diffstat (limited to 'kernel/kalloc.c')
-rw-r--r--kernel/kalloc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/kalloc.c b/kernel/kalloc.c
index afadb02..d72e0ab 100644
--- a/kernel/kalloc.c
+++ b/kernel/kalloc.c
@@ -55,8 +55,9 @@ kfree(void *pa)
// Fill with junk to catch dangling refs.
memset(pa, 1, PGSIZE);
- acquire(&kmem.lock);
r = (struct run*)pa;
+
+ acquire(&kmem.lock);
r->next = kmem.freelist;
kmem.freelist = r;
release(&kmem.lock);
@@ -75,6 +76,7 @@ kalloc(void)
if(r)
kmem.freelist = r->next;
release(&kmem.lock);
+
if(r)
memset((char*)r, 5, PGSIZE); // fill with junk
return (void*)r;