aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r--arch/ia64/Kconfig8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 3ad2c4af099c..ce4dfa8b834d 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -50,6 +50,10 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
50 bool 50 bool
51 default y 51 default y
52 52
53config IA64_UNCACHED_ALLOCATOR
54 bool
55 select GENERIC_ALLOCATOR
56
53choice 57choice
54 prompt "System type" 58 prompt "System type"
55 default IA64_GENERIC 59 default IA64_GENERIC
@@ -216,14 +220,14 @@ config IOSAPIC
216 220
217config IA64_SGI_SN_SIM 221config IA64_SGI_SN_SIM
218 bool "SGI Medusa Simulator Support" 222 bool "SGI Medusa Simulator Support"
219 depends on IA64_SGI_SN2 223 depends on IA64_SGI_SN2 || IA64_GENERIC
220 help 224 help
221 If you are compiling a kernel that will run under SGI's IA-64 225 If you are compiling a kernel that will run under SGI's IA-64
222 simulator (Medusa) then say Y, otherwise say N. 226 simulator (Medusa) then say Y, otherwise say N.
223 227
224config IA64_SGI_SN_XP 228config IA64_SGI_SN_XP
225 tristate "Support communication between SGI SSIs" 229 tristate "Support communication between SGI SSIs"
226 depends on MSPEC 230 select IA64_UNCACHED_ALLOCATOR
227 help 231 help
228 An SGI machine can be divided into multiple Single System 232 An SGI machine can be divided into multiple Single System
229 Images which act independently of each other and have 233 Images which act independently of each other and have