Index: kernel/generic/include/console/chardev.h
===================================================================
--- kernel/generic/include/console/chardev.h	(revision 74464e831800483feba22672d950a2eddcc0d953)
+++ kernel/generic/include/console/chardev.h	(revision 5d5068606a18e27450340baa4f164a93d978c7ba)
@@ -73,5 +73,5 @@
 typedef struct {
 	/** Write character to output. */
-	void (* write)(struct outdev *, wchar_t, bool);
+	void (* write)(struct outdev *, wchar_t);
 	
 	/** Redraw any previously cached characters. */
Index: kernel/generic/include/console/console.h
===================================================================
--- kernel/generic/include/console/console.h	(revision 74464e831800483feba22672d950a2eddcc0d953)
+++ kernel/generic/include/console/console.h	(revision 5d5068606a18e27450340baa4f164a93d978c7ba)
@@ -72,6 +72,5 @@
 extern void release_console(void);
 
-extern sysarg_t sys_debug_enable_console(void);
-extern sysarg_t sys_debug_disable_console(void);
+extern sysarg_t sys_debug_activate_console(void);
 
 #endif /* KERN_CONSOLE_H_ */
Index: kernel/generic/include/ddi/ddi.h
===================================================================
--- kernel/generic/include/ddi/ddi.h	(revision 74464e831800483feba22672d950a2eddcc0d953)
+++ kernel/generic/include/ddi/ddi.h	(revision 5d5068606a18e27450340baa4f164a93d978c7ba)
@@ -48,4 +48,6 @@
 	pfn_t frames;     /**< Number of frames in the area. */
 	bool unpriv;      /**< Allow mapping by unprivileged tasks. */
+	bool mapped;      /**< Indicate whether the area is actually
+	                       mapped. */
 } parea_t;
 
Index: kernel/generic/include/panic.h
===================================================================
--- kernel/generic/include/panic.h	(revision 74464e831800483feba22672d950a2eddcc0d953)
+++ kernel/generic/include/panic.h	(revision 5d5068606a18e27450340baa4f164a93d978c7ba)
@@ -60,5 +60,5 @@
 struct istate;
 
-extern bool silent;
+extern bool console_override;
 
 extern void panic_common(panic_category_t, struct istate *, int,
Index: kernel/generic/include/syscall/syscall.h
===================================================================
--- kernel/generic/include/syscall/syscall.h	(revision 74464e831800483feba22672d950a2eddcc0d953)
+++ kernel/generic/include/syscall/syscall.h	(revision 5d5068606a18e27450340baa4f164a93d978c7ba)
@@ -94,6 +94,5 @@
 	SYS_SYSINFO_GET_DATA,
 	
-	SYS_DEBUG_ENABLE_CONSOLE,
-	SYS_DEBUG_DISABLE_CONSOLE,
+	SYS_DEBUG_ACTIVATE_CONSOLE,
 	
 	SYSCALL_END