diff --git a/kernel/kdb/generic/init.cc b/kernel/kdb/generic/init.cc
index 578b0676..52653fa5 100644
--- a/kernel/kdb/generic/init.cc
+++ b/kernel/kdb/generic/init.cc
@@ -36,8 +36,8 @@
 
 
 /* THE kernel debugger instance */
-kdb_t kdb;
-
+kdb_t UNIT ("cpulocal") kdb;
+cmd_mode_t kdb_t::kdb_cmd_mode;
 
 /* From generic/linker_set.cc */
 void init_sets (void);