[Gc-linux-cvs] linux/arch/powerpc Kconfig, 1.11, 1.12 Kconfig.debug, 1.10, 1.11

[Albert H. <he...@us...>]

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

Modified Files:
	Kconfig Kconfig.debug 
Log Message:
Forward to v2.6.31.


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Kconfig	25 Oct 2009 18:53:45 -0000	1.11
--- Kconfig	25 Oct 2009 18:56:55 -0000	1.12
***************
*** 43,46 ****
--- 43,50 ----
  	default y
  
+ config GENERIC_HARDIRQS_NO__DO_IRQ
+ 	bool
+ 	default y
+ 
  config HAVE_SETUP_PER_CPU_AREA
  	def_bool PPC64
***************
*** 59,63 ****
  config TRACE_IRQFLAGS_SUPPORT
  	bool
- 	depends on PPC64
  	default y
  
--- 63,66 ----
***************
*** 90,97 ****
  	default y
  
- config GENERIC_CALIBRATE_DELAY
- 	bool
- 	default y
- 
  config GENERIC_FIND_NEXT_BIT
  	bool
--- 93,96 ----
***************
*** 126,129 ****
--- 125,130 ----
  	select HAVE_OPROFILE
  	select HAVE_SYSCALL_WRAPPERS if PPC64
+ 	select GENERIC_ATOMIC64 if PPC32
+ 	select HAVE_PERF_COUNTERS
  
  config EARLY_PRINTK
***************
*** 297,303 ****
  	def_bool PPC64
  
  config PPC_NEED_DMA_SYNC_OPS
  	def_bool y
! 	depends on NOT_COHERENT_CACHE
  
  config HOTPLUG_CPU
--- 298,314 ----
  	def_bool PPC64
  
+ config SWIOTLB
+ 	bool "SWIOTLB support"
+ 	default n
+ 	select IOMMU_HELPER
+ 	---help---
+ 	  Support for IO bounce buffering for systems without an IOMMU.
+ 	  This allows us to DMA to the full physical address space on
+ 	  platforms where the size of a physical address is larger
+ 	  than the bus address.  Not all platforms support this.
+ 
  config PPC_NEED_DMA_SYNC_OPS
  	def_bool y
! 	depends on (NOT_COHERENT_CACHE || SWIOTLB)
  
  config HOTPLUG_CPU

Index: Kconfig.debug
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig.debug,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Kconfig.debug	25 Oct 2009 18:53:45 -0000	1.10
--- Kconfig.debug	25 Oct 2009 18:56:55 -0000	1.11
***************
*** 3,6 ****
--- 3,23 ----
  source "lib/Kconfig.debug"
  
+ config PPC_DISABLE_WERROR
+ 	bool "Don't build arch/powerpc code with -Werror"
+ 	default n
+ 	help
+ 	  This option tells the compiler NOT to build the code under
+ 	  arch/powerpc with the -Werror flag (which means warnings
+ 	  are treated as errors).
+ 
+ 	  Only enable this if you are hitting a build failure in the
+ 	  arch/powerpc code caused by a warning, and you don't feel
+ 	  inclined to fix it.
+ 
+ config PPC_WERROR
+ 	bool
+ 	depends on !PPC_DISABLE_WERROR
+ 	default y
+ 
  config PRINT_STACK_DEPTH
  	int "Stack depth to print" if DEBUG_KERNEL
***************
*** 42,45 ****
--- 59,75 ----
  	  calls.
  
+ config PPC_EMULATED_STATS
+ 	bool "Emulated instructions tracking"
+ 	depends on DEBUG_FS
+ 	help
+ 	  Adds code to keep track of the number of instructions that are
+ 	  emulated by the in-kernel emulator. Counters for the various classes
+ 	  of emulated instructions are available under
+ 	  powerpc/emulated_instructions/ in the root of the debugfs file
+ 	  system. Optionally (controlled by
+ 	  powerpc/emulated_instructions/do_warn in debugfs), rate-limited
+ 	  warnings can be printed to the console when instructions are
+ 	  emulated.
+ 
  config CODE_PATCHING_SELFTEST
  	bool "Run self-tests of the code-patching code."