Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/arch/powerpc/platforms
Modified Files:
Kconfig.cputype
Log Message:
Forward to v2.6.31.
Index: Kconfig.cputype
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/Kconfig.cputype,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Kconfig.cputype 25 Oct 2009 18:53:45 -0000 1.11
--- Kconfig.cputype 25 Oct 2009 18:56:56 -0000 1.12
***************
*** 2,5 ****
--- 2,6 ----
bool "64-bit kernel"
default n
+ select PPC_HAVE_PMU_SUPPORT
help
This option selects whether a 32-bit or a 64-bit kernel
***************
*** 10,14 ****
prompt "Processor Type"
depends on PPC32
- default 6xx
help
There are five families of 32 bit PowerPC chips supported.
--- 11,14 ----
***************
*** 22,26 ****
If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx.
! config 6xx
bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx"
select PPC_FPU
--- 22,26 ----
If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx.
! config PPC_BOOK3S_32
bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx"
select PPC_FPU
***************
*** 58,68 ****
endchoice
! # Until we have a choice of exclusive CPU types on 64-bit, we always
! # use PPC_BOOK3S. On 32-bit, this is equivalent to 6xx which is
! # "classic" MMU
config PPC_BOOK3S
! def_bool y
! depends on PPC64 || 6xx
config POWER4_ONLY
--- 58,69 ----
endchoice
! config PPC_BOOK3S_64
! def_bool y
! depends on PPC64
! select PPC_FPU
config PPC_BOOK3S
! def_bool y
! depends on PPC_BOOK3S_32 || PPC_BOOK3S_64
config POWER4_ONLY
***************
*** 75,78 ****
--- 76,84 ----
when compiled with binutils 2.15 or later.
+ config 6xx
+ def_bool y
+ depends on PPC32 && PPC_BOOK3S
+ select PPC_HAVE_PMU_SUPPORT
+
config POWER3
bool
***************
*** 203,209 ****
config PPC_STD_MMU
! bool
! depends on 6xx || PPC64
! default y
config PPC_STD_MMU_32
--- 209,214 ----
config PPC_STD_MMU
! def_bool y
! depends on PPC_BOOK3S
config PPC_STD_MMU_32
***************
*** 243,246 ****
--- 248,260 ----
If in doubt, say Y here.
+ config PPC_HAVE_PMU_SUPPORT
+ bool
+
+ config PPC_PERF_CTRS
+ def_bool y
+ depends on PERF_COUNTERS && PPC_HAVE_PMU_SUPPORT
+ help
+ This enables the powerpc-specific perf_counter back-end.
+
config SMP
depends on PPC_STD_MMU || FSL_BOOKE
***************
*** 263,268 ****
config NR_CPUS
! int "Maximum number of CPUs (2-1024)"
! range 2 1024
depends on SMP
default "32" if PPC64
--- 277,282 ----
config NR_CPUS
! int "Maximum number of CPUs (2-8192)"
! range 2 8192
depends on SMP
default "32" if PPC64
|
