Commit aabded9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Further fixes for the removal of 4level-fixup hack from ppc32
  [POWERPC] EEH: log all PCI-X and PCI-E AER registers
  [POWERPC] EEH: capture and log pci state on error
  [POWERPC] EEH: Split up long error msg
  [POWERPC] EEH: log error only after driver notification.
  [POWERPC] fsl_soc: Make mac_addr const in fs_enet_of_init().
  [POWERPC] Don't use SLAB/SLUB for PTE pages
  [POWERPC] Spufs support for 64K LS mappings on 4K kernels
  [POWERPC] Add ability to 4K kernel to hash in 64K pages
  [POWERPC] Introduce address space "slices"
  [POWERPC] Small fixes & cleanups in segment page size demotion
  [POWERPC] iSeries: Make HVC_ISERIES the default
  [POWERPC] iSeries: suppress build warning in lparmap.c
  [POWERPC] Mark pages that don't exist as nosave
  [POWERPC] swsusp: Introduce register_nosave_region_late
parents 9a9136e2 f1a1eb29

arch/powerpc/Kconfig

+11 −13
Original line number Diff line number Diff line
@@ -120,19 +120,6 @@ config GENERIC_BUG 
config SYS_SUPPORTS_APM_EMULATION

	bool



#

# Powerpc uses the slab allocator to manage its ptes and the

# page structs of ptes are used for splitting the page table

# lock for configurations supporting more than SPLIT_PTLOCK_CPUS.

#

# In that special configuration the page structs of slabs are modified.

# This setting disables the selection of SLUB as a slab allocator.

#

config ARCH_USES_SLAB_PAGE_STRUCT

	bool

	default y

	depends on SPLIT_PTLOCK_CPUS <= NR_CPUS



config DEFAULT_UIMAGE

	bool

	help
@@ -352,6 +339,11 @@ config PPC_STD_MMU_32 
	def_bool y

	depends on PPC_STD_MMU && PPC32



config PPC_MM_SLICES

	bool

	default y if HUGETLB_PAGE

	default n



config VIRT_CPU_ACCOUNTING

	bool "Deterministic task and CPU time accounting"

	depends on PPC64
@@ -541,9 +533,15 @@ config NODES_SPAN_OTHER_NODES 
	def_bool y

	depends on NEED_MULTIPLE_NODES



config PPC_HAS_HASH_64K

	bool

	depends on PPC64

	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

arch/powerpc/kernel/asm-offsets.c

+11 −5
Original line number Diff line number Diff line
@@ -122,12 +122,18 @@ int main(void) 
	DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));

	DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));

	DEFINE(PACACONTEXTID, offsetof(struct paca_struct, context.id));

	DEFINE(PACACONTEXTSLLP, offsetof(struct paca_struct, context.sllp));

	DEFINE(PACAVMALLOCSLLP, offsetof(struct paca_struct, vmalloc_sllp));

#ifdef CONFIG_HUGETLB_PAGE

	DEFINE(PACALOWHTLBAREAS, offsetof(struct paca_struct, context.low_htlb_areas));

	DEFINE(PACAHIGHHTLBAREAS, offsetof(struct paca_struct, context.high_htlb_areas));

#endif /* CONFIG_HUGETLB_PAGE */

#ifdef CONFIG_PPC_MM_SLICES

	DEFINE(PACALOWSLICESPSIZE, offsetof(struct paca_struct,

					    context.low_slices_psize));

	DEFINE(PACAHIGHSLICEPSIZE, offsetof(struct paca_struct,

					    context.high_slices_psize));

	DEFINE(MMUPSIZEDEFSIZE, sizeof(struct mmu_psize_def));

	DEFINE(MMUPSIZESLLP, offsetof(struct mmu_psize_def, sllp));

#else

	DEFINE(PACACONTEXTSLLP, offsetof(struct paca_struct, context.sllp));



#endif /* CONFIG_PPC_MM_SLICES */

	DEFINE(PACA_EXGEN, offsetof(struct paca_struct, exgen));

	DEFINE(PACA_EXMC, offsetof(struct paca_struct, exmc));

	DEFINE(PACA_EXSLB, offsetof(struct paca_struct, exslb));

arch/powerpc/kernel/lparmap.c

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ 
#include <asm/pgtable.h>

#include <asm/iseries/lpar_map.h>



const struct LparMap __attribute__((__section__(".text"))) xLparMap = {

/* The # is to stop gcc trying to make .text nonexecutable */

const struct LparMap __attribute__((__section__(".text #"))) xLparMap = {

	.xNumberEsids = HvEsidsToMap,

	.xNumberRanges = HvRangesToMap,

	.xSegmentTableOffs = STAB0_PAGE,

arch/powerpc/mm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -18,4 +18,5 @@ obj-$(CONFIG_40x) += 4xx_mmu.o 
obj-$(CONFIG_44x)		+= 44x_mmu.o

obj-$(CONFIG_FSL_BOOKE)		+= fsl_booke_mmu.o

obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o

obj-$(CONFIG_PPC_MM_SLICES)	+= slice.o

obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o

arch/powerpc/mm/hash_low_64.S

+4 −1
Original line number Diff line number Diff line
@@ -615,6 +615,9 @@ htab_pte_insert_failure: 
	li	r3,-1

	b	htab_bail



#endif /* CONFIG_PPC_64K_PAGES */



#ifdef CONFIG_PPC_HAS_HASH_64K



/*****************************************************************************

 *                                                                           *
@@ -870,7 +873,7 @@ ht64_pte_insert_failure: 
	b	ht64_bail





#endif /* CONFIG_PPC_64K_PAGES */

#endif /* CONFIG_PPC_HAS_HASH_64K */





/*****************************************************************************

CRA Git | Maintained and supported by SUSTech CRA and CCSE