X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=init%2FKconfig;h=1ce05a4cb5f6ffb945391dd93c8e7e172d511d8f;hb=7ce1695c40e765e99cd790f55fc68037bc05d080;hp=fed6dc31b0dae854c26ac29216fc5a08824eaa53;hpb=8d6cea5111f2daea8acf79d7b4b384a14175ecc1;p=deliverable%2Flinux.git

diff --git a/init/Kconfig b/init/Kconfig
index fed6dc31b0da..1ce05a4cb5f6 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -16,6 +16,11 @@ config DEFCONFIG_LIST
 	default "$ARCH_DEFCONFIG"
 	default "arch/$ARCH/defconfig"
 
+config CONSTRUCTORS
+	bool
+	depends on !UML
+	default y
+
 menu "General setup"
 
 config EXPERIMENTAL
@@ -616,13 +621,13 @@ config SYSFS_DEPRECATED
 	bool
 
 config SYSFS_DEPRECATED_V2
-	bool "Create deprecated sysfs layout for older userspace tools"
+	bool "remove sysfs features which may confuse old userspace tools"
 	depends on SYSFS
-	default y
+	default n
 	select SYSFS_DEPRECATED
 	help
 	  This option switches the layout of sysfs to the deprecated
-	  version.
+	  version. Do not use it on recent distributions.
 
 	  The current sysfs layout features a unified device tree at
 	  /sys/devices/, which is able to express a hierarchy between