diff --git a/[refs] b/[refs]
index 2a574fdff1ac..cd6a5f527509 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b28002fdf2d5b6ce3135a544c04940a16c5b0ba
+refs/heads/master: f214ef3e193dea10a7b527d4f4b0c15d2d98c984
diff --git a/trunk/arch/um/Kconfig.i386 b/trunk/arch/um/Kconfig.i386
index ef79ed25aecd..85e6a55b3b59 100644
--- a/trunk/arch/um/Kconfig.i386
+++ b/trunk/arch/um/Kconfig.i386
@@ -52,3 +52,8 @@ config ARCH_HAS_SC_SIGNALS
 config ARCH_REUSE_HOST_VSYSCALL_AREA
 	bool
 	default y
+
+config GENERIC_HWEIGHT
+	bool
+	default y
+
diff --git a/trunk/arch/um/Kconfig.x86_64 b/trunk/arch/um/Kconfig.x86_64
index aae19bc4b06a..f60e9e506424 100644
--- a/trunk/arch/um/Kconfig.x86_64
+++ b/trunk/arch/um/Kconfig.x86_64
@@ -46,3 +46,8 @@ config ARCH_REUSE_HOST_VSYSCALL_AREA
 config SMP_BROKEN
 	bool
 	default y
+
+config GENERIC_HWEIGHT
+	bool
+	default y
+