Index: kernel/arch/amd64/src/debugger.c
===================================================================
--- kernel/arch/amd64/src/debugger.c	(revision 1f7cb3a9d87b214dbf470650b8d49d9df325db0d)
+++ kernel/arch/amd64/src/debugger.c	(revision 826a4e8d659d128b34fce6e71bd9c822d63c2ddf)
@@ -65,6 +65,4 @@
 };
 
-#ifndef CONFIG_DEBUG_AS_WATCHPOINT
-
 static int cmd_del_breakpoint(cmd_arg_t *argv);
 static cmd_arg_t del_argv = {
@@ -102,5 +100,4 @@
 };
 
-#endif /* CONFIG_DEBUG_AS_WATCHPOINT */
 #endif /* CONFIG_KCONSOLE */
 
@@ -321,5 +318,4 @@
 		printf("Cannot register command %s\n", bkpts_info.name);
 
-#ifndef CONFIG_DEBUG_AS_WATCHPOINT
 	cmd_initialize(&delbkpt_info);
 	if (!cmd_register(&delbkpt_info))
@@ -333,5 +329,4 @@
 	if (!cmd_register(&addwatchp_info))
 		printf("Cannot register command %s\n", addwatchp_info.name);
-#endif /* CONFIG_DEBUG_AS_WATCHPOINT */
 #endif /* CONFIG_KCONSOLE */
 	
@@ -378,6 +373,4 @@
 	return 1;
 }
-
-#ifndef CONFIG_DEBUG_AS_WATCHPOINT
 
 /** Remove breakpoint from table */
@@ -413,5 +406,4 @@
 	return 1;
 }
-#endif /* CONFIG_DEBUG_AS_WATCHPOINT */
 #endif /* CONFIG_KCONSOLE */
 
Index: kernel/arch/amd64/src/proc/scheduler.c
===================================================================
--- kernel/arch/amd64/src/proc/scheduler.c	(revision 1f7cb3a9d87b214dbf470650b8d49d9df325db0d)
+++ kernel/arch/amd64/src/proc/scheduler.c	(revision 826a4e8d659d128b34fce6e71bd9c822d63c2ddf)
@@ -40,5 +40,4 @@
 #include <arch/context.h>	/* SP_DELTA */
 #include <arch/asm.h>
-#include <arch/debugger.h>
 #include <print.h>
 #include <arch/pm.h>
@@ -69,11 +68,4 @@
 	/* TLS support - set FS to thread local storage */
 	write_msr(AMD_MSR_FS, THREAD->arch.tls);
-
-#ifdef CONFIG_DEBUG_AS_WATCHPOINT
-	/* Set watchpoint on AS to ensure that nobody sets it to zero */
-	if (CPU->id < BKPOINTS_MAX)
-		breakpoint_add(&((the_t *) THREAD->kstack)->as, 
-		    BKPOINT_WRITE | BKPOINT_CHECK_ZERO, CPU->id);
-#endif
 }