diff --git a/[refs] b/[refs]
index 60c3f4a9aa73..21857fa3222a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 444d2921215ae6c21f90eb5fa5d03f784f84f1aa
+refs/heads/master: 947be5dfdaaef01b43a3d5444688ebef2bd263d4
diff --git a/trunk/kernel/gcov/Kconfig b/trunk/kernel/gcov/Kconfig
index 5bf924d80b5c..a92028196cc1 100644
--- a/trunk/kernel/gcov/Kconfig
+++ b/trunk/kernel/gcov/Kconfig
@@ -3,7 +3,7 @@ menu "GCOV-based kernel profiling"
 config GCOV_KERNEL
 	bool "Enable gcov-based kernel profiling"
 	depends on DEBUG_FS
-	select CONSTRUCTORS
+	select CONSTRUCTORS if !UML
 	default n
 	---help---
 	This option enables gcov-based code profiling (e.g. for code coverage