Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 27bcd12..04cb4a8 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -980,6 +980,35 @@ config ARCH_ZYNQ
          Support for Xilinx Zynq ARM Cortex A9 Platform
 endchoice
 
+config SYS_SUPPORTS_HUGETLBFS
+               def_bool n
+
+config ARM_HUGETLB_SUPPORT
+       bool "Support HUGETLB for ARMv7 (EXPERIMENTAL)"
+       depends on CPU_V7 && EXPERIMENTAL
+       select SYS_SUPPORTS_HUGETLBFS
+       select HUGETLBFS
+       default y
+
+choice
+       prompt "Huge Page Size"
+       depends on ARM_HUGETLB_SUPPORT
+       default HUGEPAGE_SIZE_2MB
+
+config HUGEPAGE_SIZE_2MB
+       bool "2MB"
+       depends on ARM_HUGETLB_SUPPORT
+       help
+        This option select huge page size in 2MB units
+
+config HUGEPAGE_SIZE_16MB
+       bool "16MB"
+       depends on ARM_HUGETLB_SUPPORT
+       help
+         This option select huge page size in 16MB units
+
+endchoice
+
 #
 # This is sorted alphabetically by mach-* pathname.  However, plat-*
 # Kconfigs may be included either alphabetically (according to the
@@ -1776,7 +1805,7 @@ config LEDS_CPU
          will overrule the CPU usage LED.
 
 config ALIGNMENT_TRAP
-       bool
+       bool "Enable alignment trap"
        depends on CPU_CP15_MMU
        default y if !ARCH_EBSA110
        select HAVE_PROC_CPU if PROC_FS
@@ -1838,6 +1867,11 @@ config DEPRECATED_PARAM_STRUCT
          This was deprecated in 2001 and announced to live on for 5 years.
          Some old boot loaders still use this way.
 
+config CPU_V7_SYSFS
+       bool
+       depends on CPU_V7 && SYSFS
+       default y
+
 endmenu
 
 menu "Boot options"