Merge branch 'x86/crashdump' into x86/urgent

[linux-2.6] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 794d22fdf4639d3dc6a3749d316f3314ea373a0b..7c88263256af216c2b6889481297eeb95434949c 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -16,6 +16,7 @@ config SPARC64
        select HAVE_IDE
        select HAVE_LMB
        select HAVE_ARCH_KGDB
+       select USE_GENERIC_SMP_HELPERS if SMP
 
 config GENERIC_TIME
        bool
@@ -97,19 +98,11 @@ config SPARC64_PAGE_SIZE_8KB
          8KB and 64KB work quite well, since SPARC ELF sections
          provide for up to 64KB alignment.
 
-         Therefore, 512KB and 4MB are for expert hackers only.
-
          If you don't know what to do, choose 8KB.
 
 config SPARC64_PAGE_SIZE_64KB
        bool "64KB"
 
-config SPARC64_PAGE_SIZE_512KB
-       bool "512KB"
-
-config SPARC64_PAGE_SIZE_4MB
-       bool "4MB"
-
 endchoice
 
 config SECCOMP
@@ -225,11 +218,10 @@ config HUGETLB_PAGE_SIZE_4MB
        bool "4MB"
 
 config HUGETLB_PAGE_SIZE_512K
-       depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB
        bool "512K"
 
 config HUGETLB_PAGE_SIZE_64K
-       depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB && !SPARC64_PAGE_SIZE_64KB
+       depends on !SPARC64_PAGE_SIZE_64KB
        bool "64K"
 
 endchoice