diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-01 18:35:26 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-01 18:35:26 +0100 |
| commit | c7f7ff179cb9f2f1e0244ef2c80afbb93c74ce2a (patch) | |
| tree | 717656ebdba1fea6c763b2c57076c4c6996dfba3 /arch/arm/Kconfig | |
| parent | a22f277bba321474a01691ae66d5952926459f44 (diff) | |
| parent | e03cdade0ca945a04e982525e50fef275190b77b (diff) | |
| download | linux-stable-c7f7ff179cb9f2f1e0244ef2c80afbb93c74ce2a.tar.gz linux-stable-c7f7ff179cb9f2f1e0244ef2c80afbb93c74ce2a.tar.bz2 linux-stable-c7f7ff179cb9f2f1e0244ef2c80afbb93c74ce2a.zip | |
Merge branch 'smp' into devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 65778839d380..28248b5d6a70 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -844,7 +844,9 @@ source "kernel/time/Kconfig" config SMP bool "Symmetric Multi-Processing (EXPERIMENTAL)" depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP) + depends on GENERIC_CLOCKEVENTS select USE_GENERIC_SMP_HELPERS + select HAVE_ARM_SCU if ARCH_REALVIEW help This enables support for systems with more than one CPU. If you have a system with only one CPU, like most personal computers, say N. If @@ -862,6 +864,18 @@ config SMP If you don't know what to do here, say N. +config HAVE_ARM_SCU + bool + depends on SMP + help + This option enables support for the ARM system coherency unit + +config HAVE_ARM_TWD + bool + depends on SMP + help + This options enables support for the ARM timer and watchdog unit + choice prompt "Memory split" default VMSPLIT_3G @@ -902,6 +916,7 @@ config LOCAL_TIMERS bool "Use local timer interrupts" depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP) default y + select HAVE_ARM_TWD if ARCH_REALVIEW help Enable support for local timers on SMP platforms, rather then the legacy IPI broadcast method. Local timers allows the system |