Merge branch 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / powerpc / platforms / ps3 / Kconfig

diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index d4fc74f..920cf7a 100644 (file)
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -1,5 +1,5 @@
 config PPC_PS3
-       bool "Sony PS3 (incomplete)"
+       bool "Sony PS3"
        depends on PPC_MULTIPLATFORM && PPC64
        select PPC_CELL
        select USB_ARCH_HAS_OHCI
@@ -8,12 +8,13 @@ config PPC_PS3
        select USB_ARCH_HAS_EHCI
        select USB_EHCI_BIG_ENDIAN_MMIO
        select MEMORY_HOTPLUG
+       select PPC_PCI_CHOICE
        help
          This option enables support for the Sony PS3 game console
-         and other platforms using the PS3 hypervisor.
-         Support for this platform is not yet complete, so
-         enabling this will not result in a bootable kernel on a
-         PS3 system.
+         and other platforms using the PS3 hypervisor.  Enabling this
+         option will allow building otheros.bld, a kernel image suitable
+         for programming into flash memory, and vmlinux, a kernel image
+         suitable for loading via kexec.
 
 menu "PS3 Platform Options"
        depends on PPC_PS3
@@ -61,17 +62,6 @@ config PS3_DYNAMIC_DMA
          This support is mainly for Linux kernel development.  If unsure,
          say N.
 
-config PS3_USE_LPAR_ADDR
-       depends on PPC_PS3 && EXPERIMENTAL
-       bool "PS3 use lpar address space"
-       default y
-       help
-         This option is solely for experimentation by experts.  Disables
-         translation of lpar addresses.  SPE support currently won't work
-         without this set to y.
-
-         If you have any doubt, choose the default y.
-
 config PS3_VUART
        depends on PPC_PS3
        tristate
@@ -91,7 +81,7 @@ config PS3_SYS_MANAGER
        depends on PPC_PS3
        tristate "PS3 System Manager driver" if PS3_ADVANCED
        select PS3_VUART
-       default m
+       default y
        help
          Include support for the PS3 System Manager.
 
@@ -138,4 +128,17 @@ config PS3_FLASH
          be disabled on the kernel command line using "ps3flash=off", to
          not allocate this fixed buffer.
 
+config PS3_LPM
+       tristate "PS3 Logical Performance Monitor support"
+       depends on PPC_PS3
+       help
+         Include support for the PS3 Logical Performance Monitor.
+
+         This support is required to use the logical performance monitor
+         of the PS3's LV1 hypervisor.
+
+         If you intend to use the advanced performance monitoring and
+         profiling support of the Cell processor with programs like
+         oprofile and perfmon2, then say Y or M, otherwise say N.
+
 endmenu