diff --git a/headers/private/kernel/smp.h b/headers/private/kernel/smp.h
index c6a69146d5..a108bf651f 100644
--- a/headers/private/kernel/smp.h
+++ b/headers/private/kernel/smp.h
@@ -22,8 +22,7 @@ enum {
 	SMP_MSG_GLOBAL_INVALIDATE_PAGES,
 	SMP_MSG_CPU_HALT,
 	SMP_MSG_CALL_FUNCTION,
-	SMP_MSG_RESCHEDULE,
-	SMP_MSG_RESCHEDULE_IF_IDLE
+	SMP_MSG_RESCHEDULE
 };
 
 enum {
diff --git a/src/system/kernel/smp.cpp b/src/system/kernel/smp.cpp
index 8f74e05edf..6457c509bf 100644
--- a/src/system/kernel/smp.cpp
+++ b/src/system/kernel/smp.cpp
@@ -634,16 +634,6 @@ process_pending_ici(int32 currentCPU)
 		case SMP_MSG_RESCHEDULE:
 			thread_get_current_thread()->cpu->invoke_scheduler = true;
 			break;
-		case SMP_MSG_RESCHEDULE_IF_IDLE:
-		{
-			// TODO: We must not dereference the thread when entering the kernel
-			// debugger from a double fault.
-			struct thread* thread = thread_get_current_thread();
-			if (thread->priority == B_IDLE_PRIORITY)
-				thread->cpu->invoke_scheduler = true;
-			break;
-		}
-
 		default:
 			dprintf("smp_intercpu_int_handler: got unknown message %ld\n", msg->message);
 	}