summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2020-10-20 06:55:51 -0400
committerRobert Morris <[email protected]>2020-10-20 06:55:51 -0400
commit286b2f3c3306a621c415e8c7ce67bc2a6501998a (patch)
tree82d80466eebccd0b9e761a28e3bcf4394c60116e
parent806580d6423274e7b38329362f64a549e04ddbab (diff)
downloadxv6-labs-286b2f3c3306a621c415e8c7ce67bc2a6501998a.tar.gz
xv6-labs-286b2f3c3306a621c415e8c7ce67bc2a6501998a.tar.bz2
xv6-labs-286b2f3c3306a621c415e8c7ce67bc2a6501998a.zip
consolewrite does not need cons.lock -- can lead to sleep() with lock held
-rw-r--r--kernel/console.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/console.c b/kernel/console.c
index d606ed2..23a2d35 100644
--- a/kernel/console.c
+++ b/kernel/console.c
@@ -60,14 +60,12 @@ consolewrite(int user_src, uint64 src, int n)
{
int i;
- acquire(&cons.lock);
for(i = 0; i < n; i++){
char c;
if(either_copyin(&c, user_src, src+i, 1) == -1)
break;
uartputc(c);
}
- release(&cons.lock);
return i;
}