Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

Pull powerpc fixes from Ben Herrenschmidt:
 "The main thing that caused problem was that CONFIG_CPU_LITTLE_ENDIAN
  got turned on with allyesconfig and such, which is not a very good
  idea especially since it requires a newer toolchain than what most
  people have.

  So we turned it into a choice instead that defaults to big endian"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/windfarm: Fix XServe G5 fan control Makefile issue
  arch/powerpc/kernel: Use %12.12s instead of %12s to avoid memory overflow
  powerpc/signals: Improved mark VSX not saved with small contexts fix
  powerpc/kdump: Adding symbols in vmcoreinfo to facilitate dump filtering
  powerpc: allyesconfig should not select CONFIG_CPU_LITTLE_ENDIAN
  powerpc: Fix error when cross building TAGS & cscope
  powerpc/booke: Only check for hugetlb in flush if vma != NULL
  powerpc/85xx: typo in dts: "interupt" (four devices)
  powerpc/8xx: mfspr SPRN_TBRx in lieu of mftb/mftbu is not supported
  powerpc/corenet64: compile with CONFIG_E{5,6}500_CPU well
parents 8ae516aa 721cb59e

arch/powerpc/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -75,8 +75,10 @@ LDEMULATION := lppc 
GNUTARGET	:= powerpcle

MULTIPLEWORD	:= -mno-multiple

else

ifeq ($(call cc-option-yn,-mbig-endian),y)

override CC	+= -mbig-endian

override AS	+= -mbig-endian

endif

override LD	+= -EB

LDEMULATION	:= ppc

GNUTARGET	:= powerpc
@@ -128,7 +130,12 @@ CFLAGS-$(CONFIG_POWER5_CPU) += $(call cc-option,-mcpu=power5) 
CFLAGS-$(CONFIG_POWER6_CPU) += $(call cc-option,-mcpu=power6)

CFLAGS-$(CONFIG_POWER7_CPU) += $(call cc-option,-mcpu=power7)



# Altivec option not allowed with e500mc64 in GCC.

ifeq ($(CONFIG_ALTIVEC),y)

E5500_CPU := -mcpu=powerpc64

else

E5500_CPU := $(call cc-option,-mcpu=e500mc64,-mcpu=powerpc64)

endif

CFLAGS-$(CONFIG_E5500_CPU) += $(E5500_CPU)

CFLAGS-$(CONFIG_E6500_CPU) += $(call cc-option,-mcpu=e6500,$(E5500_CPU))

arch/powerpc/boot/dts/xcalibur1501.dts

+2 −2
Original line number Diff line number Diff line
@@ -637,14 +637,14 @@ 
		tlu@2f000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x2f000 0x1000>;

			interupts = <61 2 >;

			interrupts = <61 2>;

			interrupt-parent = <&mpic>;

		};



		tlu@15000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x15000 0x1000>;

			interupts = <75 2>;

			interrupts = <75 2>;

			interrupt-parent = <&mpic>;

		};

	};

arch/powerpc/boot/dts/xpedite5301.dts

+2 −2
Original line number Diff line number Diff line
@@ -547,14 +547,14 @@ 
		tlu@2f000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x2f000 0x1000>;

			interupts = <61 2 >;

			interrupts = <61 2>;

			interrupt-parent = <&mpic>;

		};



		tlu@15000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x15000 0x1000>;

			interupts = <75 2>;

			interrupts = <75 2>;

			interrupt-parent = <&mpic>;

		};

	};

arch/powerpc/boot/dts/xpedite5330.dts

+2 −2
Original line number Diff line number Diff line
@@ -583,14 +583,14 @@ 
		tlu@2f000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x2f000 0x1000>;

			interupts = <61 2 >;

			interrupts = <61 2>;

			interrupt-parent = <&mpic>;

		};



		tlu@15000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x15000 0x1000>;

			interupts = <75 2>;

			interrupts = <75 2>;

			interrupt-parent = <&mpic>;

		};

	};

arch/powerpc/boot/dts/xpedite5370.dts

+2 −2
Original line number Diff line number Diff line
@@ -545,14 +545,14 @@ 
		tlu@2f000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x2f000 0x1000>;

			interupts = <61 2 >;

			interrupts = <61 2>;

			interrupt-parent = <&mpic>;

		};



		tlu@15000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x15000 0x1000>;

			interupts = <75 2>;

			interrupts = <75 2>;

			interrupt-parent = <&mpic>;

		};

	};