Commit 15c659ff authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'fixes' into next 

There's a non-trivial dependency between some commits we want to put in
next and the KVM prefetch work around that went into fixes. So merge
fixes into next.
parents 516fa8d0 1a92a80a

arch/powerpc/Makefile

+13 −12
Original line number Diff line number Diff line
@@ -59,6 +59,19 @@ machine-$(CONFIG_PPC64) += 64 
machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le

UTS_MACHINE := $(subst $(space),,$(machine-y))



# XXX This needs to be before we override LD below

ifdef CONFIG_PPC32

KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o

else

ifeq ($(call ld-ifversion, -ge, 225000000, y),y)

# Have the linker provide sfpr if possible.

# There is a corresponding test in arch/powerpc/lib/Makefile

KBUILD_LDFLAGS_MODULE += --save-restore-funcs

else

KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o

endif

endif



ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)

override LD	+= -EL

LDEMULATION	:= lppc
@@ -190,18 +203,6 @@ else 
CHECKFLAGS	+= -D__LITTLE_ENDIAN__

endif



ifdef CONFIG_PPC32

KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o

else

ifeq ($(call ld-ifversion, -ge, 225000000, y),y)

# Have the linker provide sfpr if possible.

# There is a corresponding test in arch/powerpc/lib/Makefile

KBUILD_LDFLAGS_MODULE += --save-restore-funcs

else

KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o

endif

endif



ifeq ($(CONFIG_476FPE_ERR46),y)

	KBUILD_LDFLAGS_MODULE += --ppc476-workaround \

		-T $(srctree)/arch/powerpc/platforms/44x/ppc476_modules.lds

arch/powerpc/boot/Makefile

+11 −3
Original line number Diff line number Diff line
@@ -25,12 +25,20 @@ compress-$(CONFIG_KERNEL_XZ) := CONFIG_KERNEL_XZ 
BOOTCFLAGS    := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \

		 -fno-strict-aliasing -Os -msoft-float -pipe \

		 -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \

		 -isystem $(shell $(CROSS32CC) -print-file-name=include) \

		 -D$(compress-y)



BOOTCC := $(CC)

ifdef CONFIG_PPC64_BOOT_WRAPPER

BOOTCFLAGS	+= -m64

else

BOOTCFLAGS	+= -m32

ifdef CROSS32_COMPILE

    BOOTCC := $(CROSS32_COMPILE)gcc

endif

endif



BOOTCFLAGS	+= -isystem $(shell $(BOOTCC) -print-file-name=include)



ifdef CONFIG_CPU_BIG_ENDIAN

BOOTCFLAGS	+= -mbig-endian

else
@@ -183,10 +191,10 @@ clean-files := $(zlib-) $(zlibheader-) $(zliblinuxheader-) \ 
		empty.c zImage.coff.lds zImage.ps3.lds zImage.lds



quiet_cmd_bootcc = BOOTCC  $@

      cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<

      cmd_bootcc = $(BOOTCC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<



quiet_cmd_bootas = BOOTAS  $@

      cmd_bootas = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<

      cmd_bootas = $(BOOTCC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<



quiet_cmd_bootar = BOOTAR  $@

      cmd_bootar = $(CROSS32AR) -cr$(KBUILD_ARFLAGS) $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@

arch/powerpc/configs/powernv_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -293,7 +293,8 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_HARDLOCKUP_DETECTOR=y

CONFIG_LATENCYTOP=y

CONFIG_SCHED_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

arch/powerpc/configs/ppc64_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -324,7 +324,8 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_HARDLOCKUP_DETECTOR=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_LATENCYTOP=y

CONFIG_SCHED_TRACER=y

arch/powerpc/configs/pseries_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -291,7 +291,8 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_HARDLOCKUP_DETECTOR=y

CONFIG_LATENCYTOP=y

CONFIG_SCHED_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y