summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2020-10-20 06:55:51 -0400
committerFrans Kaashoek <[email protected]>2020-11-05 06:56:51 -0500
commit13dccb0380d3c694083095040fadd03bfe4f598c (patch)
treee7ad4e929e3f5d5e6e9bc023c8b221f597bd2b90
parentd4cecb269f2acc61cc1adc11fec2aa690b9c553b (diff)
downloadxv6-labs-13dccb0380d3c694083095040fadd03bfe4f598c.tar.gz
xv6-labs-13dccb0380d3c694083095040fadd03bfe4f598c.tar.bz2
xv6-labs-13dccb0380d3c694083095040fadd03bfe4f598c.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;
}