diff options
| author | Vineet Gupta | 2013-09-09 12:34:15 +0200 |
|---|---|---|
| committer | Vineet Gupta | 2013-11-07 10:04:31 +0100 |
| commit | 7d0857a54aedbd47b3de503933d65ce462970bd6 (patch) | |
| tree | bb58cf17cbe9e22baae90cb299caf118e51aaa04 | |
| parent | ARC: [SMP] Fix build failures for large NR_CPUS (diff) | |
| download | kernel-qcow2-linux-7d0857a54aedbd47b3de503933d65ce462970bd6.tar.gz kernel-qcow2-linux-7d0857a54aedbd47b3de503933d65ce462970bd6.tar.xz kernel-qcow2-linux-7d0857a54aedbd47b3de503933d65ce462970bd6.zip | |
ARC: [SMP] Disallow RTSC
RTSC is strictly incore and must not be allowed in SMP configs
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
| -rw-r--r-- | arch/arc/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arc/kernel/time.c | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index fb4177e48260..5ede5460c806 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -136,9 +136,6 @@ if SMP config ARC_HAS_COH_CACHES def_bool n -config ARC_HAS_COH_RTSC - def_bool n - config ARC_HAS_REENTRANT_IRQ_LV2 def_bool n @@ -332,8 +329,7 @@ config ARC_HAS_RTSC bool "Insn: RTSC (64-bit r/o cycle counter)" default y depends on ARC_CPU_REL_4_10 - # if SMP, enable RTSC only if counter is coherent across cores - depends on !SMP || ARC_HAS_COH_RTSC + depends on !SMP endmenu # "ARC CPU Configuration" diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c index 0a9b6b289c4f..e5f3a837fb35 100644 --- a/arch/arc/kernel/time.c +++ b/arch/arc/kernel/time.c @@ -63,9 +63,10 @@ int arc_counter_setup(void) { - /* RTSC insn taps into cpu clk, needs no setup */ - - /* For SMP, only allowed if cross-core-sync, hence usable as cs */ + /* + * For SMP this needs to be 0. However Kconfig glue doesn't + * enable this option for SMP configs + */ return 1; } |