summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-07-13 05:00:41 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-07-22 13:34:30 +1000
commit5adfd346e48c7742bad179f9e959d15afbf5f95e (patch)
tree00dd059e5919029a197f239e32deb2595dc53f9f /arch/powerpc
parent4b575f3e8aba07688fc48025efde41036e5d5eee (diff)
downloadlinux-3.10-5adfd346e48c7742bad179f9e959d15afbf5f95e.tar.gz
linux-3.10-5adfd346e48c7742bad179f9e959d15afbf5f95e.tar.bz2
linux-3.10-5adfd346e48c7742bad179f9e959d15afbf5f95e.zip
powerpc/64: Make server perfmon only built on ppc64 server devices
The 64-bit Book-E parts (to date) dont utilize the 'server' class perfmon. So building or depending on it makes no sense (and does break FSL Book-E 64-bit support). Move the selection of PPC_HAVE_PMU_SUPPORT to be based on PPC_BOOK3S_64. Based on a patch from Scott Wood. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/Kconfig.cputype2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 2165b65876f..e06e39589a0 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -1,7 +1,6 @@
config PPC64
bool "64-bit kernel"
default n
- select PPC_HAVE_PMU_SUPPORT
help
This option selects whether a 32-bit or a 64-bit kernel
will be built.
@@ -69,6 +68,7 @@ choice
config PPC_BOOK3S_64
bool "Server processors"
select PPC_FPU
+ select PPC_HAVE_PMU_SUPPORT
config PPC_BOOK3E_64
bool "Embedded processors"