diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2011-07-13 01:00:41 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-07-21 23:34:30 -0400 |
| commit | 5adfd346e48c7742bad179f9e959d15afbf5f95e (patch) | |
| tree | 00dd059e5919029a197f239e32deb2595dc53f9f /arch/powerpc/platforms | |
| parent | 4b575f3e8aba07688fc48025efde41036e5d5eee (diff) | |
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/platforms')
| -rw-r--r-- | arch/powerpc/platforms/Kconfig.cputype | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 2165b65876f9..e06e39589a09 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | config PPC64 | 1 | config PPC64 |
| 2 | bool "64-bit kernel" | 2 | bool "64-bit kernel" |
| 3 | default n | 3 | default n |
| 4 | select PPC_HAVE_PMU_SUPPORT | ||
| 5 | help | 4 | help |
| 6 | This option selects whether a 32-bit or a 64-bit kernel | 5 | This option selects whether a 32-bit or a 64-bit kernel |
| 7 | will be built. | 6 | will be built. |
| @@ -69,6 +68,7 @@ choice | |||
| 69 | config PPC_BOOK3S_64 | 68 | config PPC_BOOK3S_64 |
| 70 | bool "Server processors" | 69 | bool "Server processors" |
| 71 | select PPC_FPU | 70 | select PPC_FPU |
| 71 | select PPC_HAVE_PMU_SUPPORT | ||
| 72 | 72 | ||
| 73 | config PPC_BOOK3E_64 | 73 | config PPC_BOOK3E_64 |
| 74 | bool "Embedded processors" | 74 | bool "Embedded processors" |