SLUB: Move sysfs operations outside of slub_lock

[linux-2.6-omap-h63xx.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 8ac412b45f1882cee49d35ec6ad8ef58ce04a402..086af703da43345ecf47d6168ca7b84f5616d050 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -117,7 +117,7 @@ config MEMORY_HOTPLUG
        bool "Allow for memory hot-add"
        depends on SPARSEMEM || X86_64_ACPI_NUMA
        depends on HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG
-       depends on (IA64 || X86 || PPC64)
+       depends on (IA64 || X86 || PPC64 || SUPERH)
 
 comment "Memory hotplug is currently incompatible with Software Suspend"
        depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND
@@ -168,3 +168,7 @@ config NR_QUICK
        depends on QUICKLIST
        default "2" if (SUPERH && !SUPERH64)
        default "1"
+
+config VIRT_TO_BUS
+       def_bool y
+       depends on !ARCH_NO_VIRT_TO_BUS