diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2006-12-01 13:31:42 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-12-01 18:40:37 -0500 |
| commit | f5236225a3858b505221a59233af1f1158be9139 (patch) | |
| tree | 1d59e171dae730ead66c21cb243d218df4ab457c /arch/arm/mm/Kconfig | |
| parent | 0e5fdca7622eb950f42f97a1970670e00a739175 (diff) | |
[ARM] 3967/1: xsc3: make branch predication configurable on xsc3
Remove BTB_ENABLE from proc-xsc3.S
On some early revisions of xsc3 enabling the branch target buffer can cause
crashes, see erratum #42.
Cc: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/Kconfig')
| -rw-r--r-- | arch/arm/mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index c0bfb8212b77..efebd6050285 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -580,7 +580,7 @@ config CPU_CACHE_ROUND_ROBIN | |||
| 580 | 580 | ||
| 581 | config CPU_BPREDICT_DISABLE | 581 | config CPU_BPREDICT_DISABLE |
| 582 | bool "Disable branch prediction" | 582 | bool "Disable branch prediction" |
| 583 | depends on CPU_ARM1020 || CPU_V6 | 583 | depends on CPU_ARM1020 || CPU_V6 || CPU_XSC3 |
| 584 | help | 584 | help |
| 585 | Say Y here to disable branch prediction. If unsure, say N. | 585 | Say Y here to disable branch prediction. If unsure, say N. |
| 586 | 586 | ||