summaryrefslogtreecommitdiff
path: root/i386
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2015-09-27 14:40:02 +0200
committerJustus Winter <4winter@informatik.uni-hamburg.de>2015-09-27 15:45:50 +0200
commit16a8848a4f04b429d0c76c72118a7b39002cd9c2 (patch)
treeda02356b1580bab8629f06f5a0f89ff458dc5273 /i386
parentf1401610bbb8363e7f015f07b825320dd69c13ca (diff)
Fix build with -DDEBUG
* device/cirbuf.c: Add missing include. * i386/i386/debug.h (dump_ss): Hide declaration from assembler. * i386/i386/debug_i386.c: Fix include. * kern/sched_prim.h: Add missing include, fix declaration.
Diffstat (limited to 'i386')
-rw-r--r--i386/i386/debug.h2
-rw-r--r--i386/i386/debug_i386.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/i386/i386/debug.h b/i386/i386/debug.h
index e94649b..84397ba 100644
--- a/i386/i386/debug.h
+++ b/i386/i386/debug.h
@@ -23,10 +23,12 @@
#ifndef _I386_DEBUG_
#define _I386_DEBUG_
+#ifndef __ASSEMBLER__
/* Dump a saved state.
Probably a good idea to have this around
even when DEBUG isn't turned on. */
void dump_ss(const struct i386_saved_state *st);
+#endif /* __ASSEMBLER__ */
#ifdef DEBUG
diff --git a/i386/i386/debug_i386.c b/i386/i386/debug_i386.c
index 7657808..f0fe2ae 100644
--- a/i386/i386/debug_i386.c
+++ b/i386/i386/debug_i386.c
@@ -128,7 +128,7 @@ debug_trace_dump(void)
splx(s);
}
-#include "syscall_sw.h"
+#include <kern/syscall_sw.h>
int syscall_trace = 0;