From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 28 May 2014 03:30:12 +0000 (+1000)
Subject: Merge branch 'merge' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=86969cf7330a53c93edfd1bf2c28ad053e289162;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'merge' into next

Merge the binutils and kexec fixes.
---

86969cf7330a53c93edfd1bf2c28ad053e289162
diff --cc arch/powerpc/Makefile
index 68cde2f8a12c,ce4c68a4a823..5687e299d0a5
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@@ -155,8 -150,10 +155,10 @@@ endi
  
  CFLAGS-$(CONFIG_TUNE_CELL) += $(call cc-option,-mtune=cell)
  
- KBUILD_CPPFLAGS	+= -Iarch/$(ARCH)
+ asinstr := $(call as-instr,lis 9$(comma)foo@high,-DHAVE_AS_ATHIGH=1)
+ 
+ KBUILD_CPPFLAGS	+= -Iarch/$(ARCH) $(asinstr)
 -KBUILD_AFLAGS	+= -Iarch/$(ARCH)
 +KBUILD_AFLAGS	+= -Iarch/$(ARCH) $(AFLAGS-y)
  KBUILD_CFLAGS	+= -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
  CPP		= $(CC) -E $(KBUILD_CFLAGS)