[Gc-linux-cvs] linux/arch/powerpc Kconfig, 1.8, 1.9 Kconfig.debug, 1.7, 1.8

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-serv29988/arch/powerpc

Modified Files:
	Kconfig Kconfig.debug 
Log Message:
Forward to v.2.6.30.


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Kconfig	25 Oct 2009 18:33:46 -0000	1.8
--- Kconfig	25 Oct 2009 18:45:35 -0000	1.9
***************
*** 112,115 ****
--- 112,116 ----
  	select HAVE_DYNAMIC_FTRACE
  	select HAVE_FUNCTION_TRACER
+ 	select HAVE_FUNCTION_GRAPH_TRACER
  	select ARCH_WANT_OPTIONAL_GPIOLIB
  	select HAVE_IDE
***************
*** 181,184 ****
--- 182,189 ----
  	bool
  
+ config DTC
+        bool
+        default y
+ 
  config DEFAULT_UIMAGE
  	bool
***************
*** 228,231 ****
--- 233,239 ----
  	default n
  
+ config ARCH_SUPPORTS_DEBUG_PAGEALLOC
+ 	def_bool y
+ 
  source "init/Kconfig"
  
***************
*** 313,317 ****
  config KEXEC
  	bool "kexec system call (EXPERIMENTAL)"
! 	depends on (PPC_PRPMC2800 || PPC_MULTIPLATFORM) && EXPERIMENTAL
  	help
  	  kexec is a system call that implements the ability to shutdown your
--- 321,325 ----
  config KEXEC
  	bool "kexec system call (EXPERIMENTAL)"
! 	depends on PPC_BOOK3S && EXPERIMENTAL
  	help
  	  kexec is a system call that implements the ability to shutdown your
***************
*** 343,347 ****
  	  Hypervisor-assisted dump is meant to be a kdump replacement
  	  offering robustness and speed not possible without system
! 	  hypervisor assistence.
  
  	  If unsure, say "N"
--- 351,355 ----
  	  Hypervisor-assisted dump is meant to be a kdump replacement
  	  offering robustness and speed not possible without system
! 	  hypervisor assistance.
  
  	  If unsure, say "N"
***************
*** 410,413 ****
--- 418,433 ----
  	default n
  
+ config STDBINUTILS
+ 	bool "Using standard binutils settings"
+ 	depends on 44x
+ 	default y
+ 	help
+ 	  Turning this option off allows you to select 256KB PAGE_SIZE on 44x.
+ 	  Note, that kernel will be able to run only those applications,
+ 	  which had been compiled using binutils later than 2.17.50.0.3 with
+ 	  '-zmax-page-size' set to 256K (the default is 64K). Or, if using
+ 	  the older binutils, you can patch them with a trivial patch, which
+ 	  changes the ELF_MAXPAGESIZE definition from 0x10000 to 0x40000.
+ 
  choice
  	prompt "Page size"
***************
*** 445,448 ****
--- 465,481 ----
  	select PPC_HAS_HASH_64K if PPC_STD_MMU_64
  
+ config PPC_256K_PAGES
+ 	bool "256k page size" if 44x
+ 	depends on !STDBINUTILS
+ 	help
+ 	  Make the page size 256k.
+ 
+ 	  As the ELF standard only requires alignment to support page
+ 	  sizes up to 64k, you will need to compile all of your user
+ 	  space applications with a non-standard binutils settings
+ 	  (see the STDBINUTILS description for details).
+ 
+ 	  Say N unless you know what you are doing.
+ 
  endchoice
  
***************
*** 457,460 ****
--- 490,495 ----
  	range 7 64 if PPC_STD_MMU_32 && PPC_64K_PAGES
  	default "7" if PPC_STD_MMU_32 && PPC_64K_PAGES
+ 	range 5 64 if PPC_STD_MMU_32 && PPC_256K_PAGES
+ 	default "5" if PPC_STD_MMU_32 && PPC_256K_PAGES
  	range 11 64
  	default "11"
***************
*** 595,598 ****
--- 630,634 ----
   	bool
  	select PPC_INDIRECT_PCI
+ 	select PCI_QUIRKS
  
  config 4xx_SOC
***************
*** 731,734 ****
--- 767,787 ----
  	default "0x30000000"
  
+ config LOWMEM_CAM_NUM_BOOL
+ 	bool "Set number of CAMs to use to map low memory"
+ 	depends on ADVANCED_OPTIONS && FSL_BOOKE
+ 	help
+ 	  This option allows you to set the maximum number of CAM slots that
+ 	  will be used to map low memory.  There are a limited number of slots
+ 	  available and even more limited number that will fit in the L1 MMU.
+ 	  However, using more entries will allow mapping more low memory.  This
+ 	  can be useful in optimizing the layout of kernel virtual memory.
+ 
+ 	  Say N here unless you know what you are doing.
+ 
+ config LOWMEM_CAM_NUM
+ 	depends on FSL_BOOKE
+ 	int "Number of CAMs to use to map low memory" if LOWMEM_CAM_NUM_BOOL
+ 	default 3
+ 
  config RELOCATABLE
  	bool "Build a relocatable kernel (EXPERIMENTAL)"
***************
*** 795,799 ****
  config PHYSICAL_ALIGN
  	hex
! 	default "0x10000000" if FSL_BOOKE
  	help
  	  This value puts the alignment restrictions on physical address
--- 848,852 ----
  config PHYSICAL_ALIGN
  	hex
! 	default "0x04000000" if FSL_BOOKE
  	help
  	  This value puts the alignment restrictions on physical address
***************
*** 816,832 ****
  	default "0xc0000000"
  
- config CONSISTENT_START_BOOL
- 	bool "Set custom consistent memory pool address"
- 	depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
- 	help
- 	  This option allows you to set the base virtual address
- 	  of the consistent memory pool.  This pool of virtual
- 	  memory is used to make consistent memory allocations.
- 
- config CONSISTENT_START
- 	hex "Base virtual address of consistent memory pool" if CONSISTENT_START_BOOL
- 	default "0xfd000000" if (NOT_COHERENT_CACHE && 8xx)
- 	default "0xff100000" if NOT_COHERENT_CACHE
- 
  config CONSISTENT_SIZE_BOOL
  	bool "Set custom consistent memory pool size"
--- 869,872 ----

Index: Kconfig.debug
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig.debug,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Kconfig.debug	25 Oct 2009 18:33:46 -0000	1.7
--- Kconfig.debug	25 Oct 2009 18:45:35 -0000	1.8
***************
*** 28,40 ****
  	  This option will slow down process creation somewhat.
  
- config DEBUG_PAGEALLOC
-         bool "Debug page memory allocations"
-         depends on DEBUG_KERNEL && !HIBERNATION
-         help
-           Unmap pages from the kernel linear mapping after free_pages().
-           This results in a large slowdown, but helps to find certain types
-           of memory corruptions.
- 
- 
  config HCALL_STATS
  	bool "Hypervisor call instrumentation"
--- 28,31 ----
***************
*** 130,134 ****
  config BOOTX_TEXT
  	bool "Support for early boot text console (BootX or OpenFirmware only)"
! 	depends on PPC_OF && PPC_MULTIPLATFORM
  	help
  	  Say Y here to see progress messages from the boot firmware in text
--- 121,125 ----
  config BOOTX_TEXT
  	bool "Support for early boot text console (BootX or OpenFirmware only)"
! 	depends on PPC_OF && PPC_BOOK3S
  	help
  	  Say Y here to see progress messages from the boot firmware in text