merged in all changes done to the trunk up to Aug 28

[pintos-anon] / src / threads / init.h

diff --git a/src/threads/init.h b/src/threads/init.h
index fafb4924bfd1931fb4ced93a36d8e28fa97c1f7a..36b41877d24fc1c9ac133b217e826b677a851c22 100644 (file)
--- a/src/threads/init.h
+++ b/src/threads/init.h
@@ -1,9 +1,18 @@
 #ifndef THREADS_INIT_H
 #define THREADS_INIT_H
 
+#include <debug.h>
+#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 
-/* Physical memory size, in 4 kB pages. */
-size_t ram_pages;
+/* Page directory with kernel mappings only. */
+extern uint32_t *base_page_dir;
+
+/* -q: Power off when kernel tasks complete? */
+extern bool power_off_when_done;
+
+void power_off (void) NO_RETURN;
+void reboot (void);
 
 #endif /* threads/init.h */