summaryrefslogtreecommitdiff
path: root/console.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2019-06-05 14:14:57 -0400
committerRobert Morris <[email protected]>2019-06-05 14:14:57 -0400
commit5eb1cb49722cce9afee48886a8db138d5f58d0ff (patch)
treeee8c81e5b3fdfc75e154e23687f53fcb50158617 /console.c
parent31136437684b5987ef46f4c6947940cf96de75b3 (diff)
downloadxv6-labs-5eb1cb49722cce9afee48886a8db138d5f58d0ff.tar.gz
xv6-labs-5eb1cb49722cce9afee48886a8db138d5f58d0ff.tar.bz2
xv6-labs-5eb1cb49722cce9afee48886a8db138d5f58d0ff.zip
push_off() and pop_off() in myproc()
Diffstat (limited to 'console.c')
-rw-r--r--console.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/console.c b/console.c
index 122ccb3..ca20842 100644
--- a/console.c
+++ b/console.c
@@ -17,7 +17,7 @@
static void consputc(int);
-static int panicked = 0;
+static volatile int panicked = 0;
static struct {
struct spinlock lock;
@@ -120,6 +120,7 @@ printf(char *fmt, ...)
void
panic(char *s)
{
+ cons.locking = 0;
printf("panic: ");
printf(s);
printf("\n");