[Gc-linux-cvs] linux/arch/powerpc Kconfig, 1.6, 1.7 Kconfig.debug, 1.5, 1.6

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/gc-linux/linux/arch/powerpc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/arch/powerpc

Modified Files:
	Kconfig Kconfig.debug 
Log Message:
Merge v2.6.29-rc6.

NOTE: Some of the Kconfig options and Makefile entries for the drivers
marked as "broken" will disappear with this commit.

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Kconfig	1 Feb 2009 18:29:34 -0000	1.6
--- Kconfig	2 Mar 2009 19:26:36 -0000	1.7
***************
*** 109,112 ****
--- 109,114 ----
  	bool
  	default y
+ 	select HAVE_FTRACE_MCOUNT_RECORD
+ 	select HAVE_DYNAMIC_FTRACE
  	select HAVE_FUNCTION_TRACER
  	select ARCH_WANT_OPTIONAL_GPIOLIB
***************
*** 122,125 ****
--- 124,128 ----
  	select USE_GENERIC_SMP_HELPERS if SMP
  	select HAVE_OPROFILE
+ 	select HAVE_SYSCALL_WRAPPERS if PPC64

  config EARLY_PRINTK
***************
*** 142,146 ****
  	default y if PPC32

! config SCHED_NO_NO_OMIT_FRAME_POINTER
  	bool
  	default y
--- 145,149 ----
  	default y if PPC32

! config SCHED_OMIT_FRAME_POINTER
  	bool
  	default y
***************
*** 286,289 ****
--- 289,296 ----
  	def_bool PPC64

+ config PPC_NEED_DMA_SYNC_OPS
+ 	def_bool y
+ 	depends on NOT_COHERENT_CACHE
+ 
  config HOTPLUG_CPU
  	bool "Support for enabling/disabling CPUs"
***************
*** 323,327 ****
  config CRASH_DUMP
  	bool "Build a kdump crash kernel"
! 	depends on PPC_MULTIPLATFORM && PPC64 && RELOCATABLE
  	help
  	  Build a kernel suitable for use as a kdump capture kernel.
--- 330,335 ----
  config CRASH_DUMP
  	bool "Build a kdump crash kernel"
! 	depends on PPC64 || 6xx
! 	select RELOCATABLE if PPC64
  	help
  	  Build a kernel suitable for use as a kdump capture kernel.
***************
*** 402,422 ****
  	default n

! config PPC_64K_PAGES
! 	bool "64k page size"
! 	depends on PPC64
! 	select PPC_HAS_HASH_64K
  	help
! 	  This option changes the kernel logical page size to 64k. On machines
! 	  without processor support for 64k pages, the kernel will simulate
! 	  them by loading each individual 4k page on demand transparently,
! 	  while on hardware with such support, it will be used to map
! 	  normal application pages.

  config FORCE_MAX_ZONEORDER
  	int "Maximum zone order"
! 	range 9 64 if PPC_64K_PAGES
! 	default "9" if PPC_64K_PAGES
! 	range 13 64 if PPC64 && !PPC_64K_PAGES
! 	default "13" if PPC64 && !PPC_64K_PAGES
  	range 11 64
  	default "11"
--- 410,460 ----
  	default n

! choice
! 	prompt "Page size"
! 	default PPC_4K_PAGES
  	help
! 	  Select the kernel logical page size. Increasing the page size
! 	  will reduce software overhead at each page boundary, allow
! 	  hardware prefetch mechanisms to be more effective, and allow
! 	  larger dma transfers increasing IO efficiency and reducing
! 	  overhead. However the utilization of memory will increase.
! 	  For example, each cached file will using a multiple of the
! 	  page size to hold its contents and the difference between the
! 	  end of file and the end of page is wasted.
! 
! 	  Some dedicated systems, such as software raid serving with
! 	  accelerated calculations, have shown significant increases.
! 
! 	  If you configure a 64 bit kernel for 64k pages but the
! 	  processor does not support them, then the kernel will simulate
! 	  them with 4k pages, loading them on demand, but with the
! 	  reduced software overhead and larger internal fragmentation.
! 	  For the 32 bit kernel, a large page option will not be offered
! 	  unless it is supported by the configured processor.
! 
! 	  If unsure, choose 4K_PAGES.
! 
! config PPC_4K_PAGES
! 	bool "4k page size"
! 
! config PPC_16K_PAGES
! 	bool "16k page size" if 44x
! 
! config PPC_64K_PAGES
! 	bool "64k page size" if 44x || PPC_STD_MMU_64
! 	select PPC_HAS_HASH_64K if PPC_STD_MMU_64
! 
! endchoice

  config FORCE_MAX_ZONEORDER
  	int "Maximum zone order"
! 	range 9 64 if PPC_STD_MMU_64 && PPC_64K_PAGES
! 	default "9" if PPC_STD_MMU_64 && PPC_64K_PAGES
! 	range 13 64 if PPC_STD_MMU_64 && !PPC_64K_PAGES
! 	default "13" if PPC_STD_MMU_64 && !PPC_64K_PAGES
! 	range 9 64 if PPC_STD_MMU_32 && PPC_16K_PAGES
! 	default "9" if PPC_STD_MMU_32 && PPC_16K_PAGES
! 	range 7 64 if PPC_STD_MMU_32 && PPC_64K_PAGES
! 	default "7" if PPC_STD_MMU_32 && PPC_64K_PAGES
  	range 11 64
  	default "11"
***************
*** 438,442 ****
  config PPC_SUBPAGE_PROT
  	bool "Support setting protections for 4k subpages"
! 	depends on PPC_64K_PAGES
  	help
  	  This option adds support for a system call to allow user programs
--- 476,480 ----
  config PPC_SUBPAGE_PROT
  	bool "Support setting protections for 4k subpages"
! 	depends on PPC_STD_MMU_64 && PPC_64K_PAGES
  	help
  	  This option adds support for a system call to allow user programs
***************
*** 839,846 ****
  source "fs/Kconfig"

- # XXX source "arch/ppc/8xx_io/Kconfig"
- 
- # XXX source "arch/ppc/8260_io/Kconfig"
- 
  source "arch/powerpc/sysdev/qe_lib/Kconfig"

--- 877,880 ----

Index: Kconfig.debug
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig.debug,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Kconfig.debug	1 Feb 2009 18:29:34 -0000	1.5
--- Kconfig.debug	2 Mar 2009 19:26:37 -0000	1.6
***************
*** 3,6 ****
--- 3,15 ----
  source "lib/Kconfig.debug"

+ config PRINT_STACK_DEPTH
+ 	int "Stack depth to print" if DEBUG_KERNEL
+ 	default 64
+ 	help
+ 	  This option allows you to set the stack depth that the kernel
+ 	  prints in stack traces. This can be useful if your display is
+ 	  too small and stack traces cause important information to
+ 	  scroll off the screen.
+ 
  config DEBUG_STACKOVERFLOW
  	bool "Check for stack overflows"