diff --git a/[refs] b/[refs]
index e3469214ea2f..d9b7f3ac3a9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c17f4d615f34a4ecfcf9132d643126b226f5e79
+refs/heads/master: f316fe687521fad5ad2fd8389397c38aa97439d2
diff --git a/trunk/arch/x86/Kconfig.debug b/trunk/arch/x86/Kconfig.debug
index 46d34b2db421..2a859a7e2d74 100644
--- a/trunk/arch/x86/Kconfig.debug
+++ b/trunk/arch/x86/Kconfig.debug
@@ -205,6 +205,7 @@ config DEBUG_BOOT_PARAMS
 
 config CPA_DEBUG
 	bool "CPA self test code"
+	depends on DEBUG_KERNEL
 	help
 	  Do change_page_attr self tests at boot.