Index: arch/amd64/src/proc/scheduler.c
===================================================================
--- arch/amd64/src/proc/scheduler.c	(revision 23d22eb27cfdf57d63002f3401a0a522db3288b0)
+++ arch/amd64/src/proc/scheduler.c	(revision 0f250f9bff41704344ca927ecc587c2eb450e9ee)
@@ -35,4 +35,5 @@
 #include <arch/debugger.h>
 
+#include <print.h>
 void before_thread_runs_arch(void)
 {
@@ -45,12 +46,10 @@
 	swapgs();
 
-
 #ifdef CONFIG_DEBUG_AS_WATCHPOINT
 	/* Set watchpoint on AS to ensure that nobody sets it to zero */
-	static int old_slot = -1;
-	if (old_slot >=0)
-		breakpoint_del(old_slot);
-	old_slot = breakpoint_add(&((the_t *) THREAD->kstack)->as, 
-				  BKPOINT_WRITE | BKPOINT_CHECK_ZERO);
+	if (CPU->id < BKPOINTS_MAX)
+		breakpoint_add(&((the_t *) THREAD->kstack)->as, 
+			       BKPOINT_WRITE | BKPOINT_CHECK_ZERO,
+			       CPU->id);
 #endif
 }