aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>2008-02-02 15:10:32 -0500
committerSam Ravnborg <sam@ravnborg.org>2008-02-03 02:58:07 -0500
commitc0ffa3a951668734a635cd1e26bf7583795854c5 (patch)
tree5fc4f5de59a09edb24d69f563e8b74d2cdc6d6b4 /arch/arm/Kconfig
parent603d49885e023d1f68c627c2a2db599fb40eefec (diff)
Fix ARM to play nicely with generic Instrumentation menu
The conflicting commit for move-kconfiginstrumentation-to-arch-kconfig-and-init-kconfig.patch is the ARM fix from Linus : commit 38ad9aebe70dc72df08851bbd1620d89329129ba He just seemed to agree that my approach (just putting the missing ARM config options in arch/arm/Kconfig) works too. The main advantage it has is that it is smaller, does not need a cleanup in the future and does not break the following patches unnecessarily. It's just been discussed here http://lkml.org/lkml/2008/1/15/267 However, Linus might prefer to stay with his own patch and I would totally understand it that late in the release cycle. Therefore I submit this for the next release cycle. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Cc: Jeff Dike <jdike@addtoit.com> Cc: David Howells <dhowells@redhat.com> Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com> CC: Russell King <rmk+lkml@arm.linux.org.uk> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig19
1 files changed, 18 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4b1a8e3d292c..623eaa1f3080 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -135,6 +135,23 @@ config FIQ
135config ARCH_MTD_XIP 135config ARCH_MTD_XIP
136 bool 136 bool
137 137
138if OPROFILE
139
140config OPROFILE_ARMV6
141 def_bool y
142 depends on CPU_V6 && !SMP
143 select OPROFILE_ARM11_CORE
144
145config OPROFILE_MPCORE
146 def_bool y
147 depends on CPU_V6 && SMP
148 select OPROFILE_ARM11_CORE
149
150config OPROFILE_ARM11_CORE
151 bool
152
153endif
154
138config VECTORS_BASE 155config VECTORS_BASE
139 hex 156 hex
140 default 0xffff0000 if MMU || CPU_HIGH_VECTOR 157 default 0xffff0000 if MMU || CPU_HIGH_VECTOR
@@ -1128,7 +1145,7 @@ endmenu
1128 1145
1129source "fs/Kconfig" 1146source "fs/Kconfig"
1130 1147
1131source "arch/arm/Kconfig.instrumentation" 1148source "kernel/Kconfig.instrumentation"
1132 1149
1133source "arch/arm/Kconfig.debug" 1150source "arch/arm/Kconfig.debug"
1134 1151