diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index c9ef68c21..6eb6aa933 100644
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -2968,27 +2968,6 @@ COMMAND_HANDLER(cortex_a_handle_dbginit_command)
 	return cortex_a_init_debug_access(target);
 }
 
-COMMAND_HANDLER(cortex_a_handle_smp_gdb_command)
-{
-	struct target *target = get_current_target(CMD_CTX);
-	int retval = ERROR_OK;
-	struct target_list *head;
-	head = target->head;
-	if (head != (struct target_list *)NULL) {
-		if (CMD_ARGC == 1) {
-			int coreid = 0;
-			COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], coreid);
-			if (ERROR_OK != retval)
-				return retval;
-			target->gdb_service->core[1] = coreid;
-
-		}
-		command_print(CMD_CTX, "gdb coreid  %" PRId32 " -> %" PRId32, target->gdb_service->core[0]
-			, target->gdb_service->core[1]);
-	}
-	return ERROR_OK;
-}
-
 COMMAND_HANDLER(handle_cortex_a_mask_interrupts_command)
 {
 	struct target *target = get_current_target(CMD_CTX);
@@ -3058,13 +3037,6 @@ static const struct command_registration cortex_a_exec_command_handlers[] = {
 		.help = "Initialize core debug",
 		.usage = "",
 	},
-	{
-		.name = "smp_gdb",
-		.handler = cortex_a_handle_smp_gdb_command,
-		.mode = COMMAND_EXEC,
-		.help = "display/fix current core played to gdb",
-		.usage = "",
-	},
 	{
 		.name = "maskisr",
 		.handler = handle_cortex_a_mask_interrupts_command,
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 016b5a9c5..653d732f1 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -1334,27 +1334,6 @@ COMMAND_HANDLER(mips_m4k_handle_cp0_command)
 	return ERROR_OK;
 }
 
-COMMAND_HANDLER(mips_m4k_handle_smp_gdb_command)
-{
-	struct target *target = get_current_target(CMD_CTX);
-	int retval = ERROR_OK;
-	struct target_list *head;
-	head = target->head;
-	if (head != (struct target_list *)NULL) {
-		if (CMD_ARGC == 1) {
-			int coreid = 0;
-			COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], coreid);
-			if (ERROR_OK != retval)
-				return retval;
-			target->gdb_service->core[1] = coreid;
-
-		}
-		command_print(CMD_CTX, "gdb coreid  %" PRId32 " -> %" PRId32, target->gdb_service->core[0]
-			, target->gdb_service->core[1]);
-	}
-	return ERROR_OK;
-}
-
 COMMAND_HANDLER(mips_m4k_handle_scan_delay_command)
 {
 	struct target *target = get_current_target(CMD_CTX);
@@ -1386,13 +1365,6 @@ static const struct command_registration mips_m4k_exec_command_handlers[] = {
 		.usage = "regnum [value]",
 		.help = "display/modify cp0 register",
 	},
-	{
-		.name = "smp_gdb",
-		.handler = mips_m4k_handle_smp_gdb_command,
-		.mode = COMMAND_EXEC,
-		.help = "display/fix current core played to gdb",
-		.usage = "",
-	},
 	{
 		.name = "scan_delay",
 		.handler = mips_m4k_handle_scan_delay_command,
diff --git a/src/target/smp.c b/src/target/smp.c
index 87944331e..f42d8abed 100644
--- a/src/target/smp.c
+++ b/src/target/smp.c
@@ -151,6 +151,27 @@ COMMAND_HANDLER(deprecated_handle_smp_off_command)
 	return CALL_COMMAND_HANDLER(default_handle_smp_command);
 }
 
+COMMAND_HANDLER(handle_smp_gdb_command)
+{
+	struct target *target = get_current_target(CMD_CTX);
+	int retval = ERROR_OK;
+	struct target_list *head;
+	head = target->head;
+	if (head != (struct target_list *)NULL) {
+		if (CMD_ARGC == 1) {
+			int coreid = 0;
+			COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], coreid);
+			if (ERROR_OK != retval)
+				return retval;
+			target->gdb_service->core[1] = coreid;
+
+		}
+		command_print(CMD_CTX, "gdb coreid  %" PRId32 " -> %" PRId32, target->gdb_service->core[0]
+			, target->gdb_service->core[1]);
+	}
+	return ERROR_OK;
+}
+
 const struct command_registration smp_command_handlers[] = {
 	{
 		.name = "smp",
@@ -173,5 +194,12 @@ const struct command_registration smp_command_handlers[] = {
 		.help = "Stop smp handling",
 		.usage = "",
 	},
+	{
+		.name = "smp_gdb",
+		.handler = handle_smp_gdb_command,
+		.mode = COMMAND_EXEC,
+		.help = "display/fix current core played to gdb",
+		.usage = "",
+	},
 	COMMAND_REGISTRATION_DONE
 };