From: Albert H. <he...@us...> - 2009-12-09 18:40:17
|
Update of /cvsroot/gc-linux/linux/arch/powerpc In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/arch/powerpc Modified Files: Kconfig Log Message: Forward to v2.6.32. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Kconfig 9 Dec 2009 18:18:06 -0000 1.14 --- Kconfig 9 Dec 2009 18:40:08 -0000 1.15 *************** *** 50,53 **** --- 50,56 ---- def_bool PPC64 + config NEED_PER_CPU_EMBED_FIRST_CHUNK + def_bool PPC64 + config IRQ_PER_CPU bool *************** *** 121,130 **** select HAVE_ARCH_TRACEHOOK select HAVE_LMB ! select HAVE_DMA_ATTRS if PPC64 select USE_GENERIC_SMP_HELPERS if SMP select HAVE_OPROFILE select HAVE_SYSCALL_WRAPPERS if PPC64 select GENERIC_ATOMIC64 if PPC32 ! select HAVE_PERF_COUNTERS config EARLY_PRINTK --- 124,134 ---- select HAVE_ARCH_TRACEHOOK select HAVE_LMB ! select HAVE_DMA_ATTRS ! select HAVE_DMA_API_DEBUG select USE_GENERIC_SMP_HELPERS if SMP select HAVE_OPROFILE select HAVE_SYSCALL_WRAPPERS if PPC64 select GENERIC_ATOMIC64 if PPC32 ! select HAVE_PERF_EVENTS config EARLY_PRINTK *************** *** 308,315 **** 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 bool "Support for enabling/disabling CPUs" --- 312,315 ---- *************** *** 386,392 **** --- 386,398 ---- config NODES_SHIFT int + default "8" if PPC64 default "4" depends on NEED_MULTIPLE_NODES + config MAX_ACTIVE_REGIONS + int + default "256" if PPC64 + default "32" + config ARCH_SELECT_MEMORY_MODEL def_bool y *************** *** 409,412 **** --- 415,422 ---- def_bool y + config SYS_SUPPORTS_HUGETLBFS + def_bool y + depends on PPC_BOOK3S_64 + source "mm/Kconfig" *************** *** 473,477 **** config PPC_64K_PAGES ! bool "64k page size" if 44x || PPC_STD_MMU_64 select PPC_HAS_HASH_64K if PPC_STD_MMU_64 --- 483,487 ---- config PPC_64K_PAGES ! bool "64k page size" if 44x || PPC_STD_MMU_64 || PPC_BOOK3E_64 select PPC_HAS_HASH_64K if PPC_STD_MMU_64 *************** *** 493,506 **** 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 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" --- 503,516 ---- config FORCE_MAX_ZONEORDER int "Maximum zone order" ! range 9 64 if PPC64 && PPC_64K_PAGES ! default "9" if PPC64 && PPC_64K_PAGES ! range 13 64 if PPC64 && !PPC_64K_PAGES ! default "13" if PPC64 && !PPC_64K_PAGES ! range 9 64 if PPC32 && PPC_16K_PAGES ! default "9" if PPC32 && PPC_16K_PAGES ! range 7 64 if PPC32 && PPC_64K_PAGES ! default "7" if PPC32 && PPC_64K_PAGES ! range 5 64 if PPC32 && PPC_256K_PAGES ! default "5" if PPC32 && PPC_256K_PAGES range 11 64 default "11" |