Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6 (8bc2bee2) · Commits · e / devices / android_kernel_xiaomi_markw

arch/ppc/Makefile

+10 −1

Original line number	Diff line number	Diff line
		@@ -21,11 +21,13 @@ CC := $(CC) -m32
		endif

		LDFLAGS_vmlinux := -Ttext $(KERNELLOAD) -Bstatic
		CPPFLAGS += -Iarch/$(ARCH)
		CPPFLAGS += -Iarch/$(ARCH) -Iinclude3
		AFLAGS += -Iarch/$(ARCH)
		CFLAGS += -Iarch/$(ARCH) -msoft-float -pipe \
		-ffixed-r2 -mmultiple
		CPP = $(CC) -E $(CFLAGS)
		# Temporary hack until we have migrated to asm-powerpc
		LINUXINCLUDE += -Iinclude3

		CHECKFLAGS += -D__powerpc__

		@@ -101,6 +103,7 @@ endef

		archclean:
		$(Q)$(MAKE) $(clean)=arch/ppc/boot
		$(Q)rm -rf include3

		prepare: include/asm-$(ARCH)/offsets.h checkbin

		@@ -110,6 +113,12 @@ arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
		include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
		$(call filechk,gen-asm-offsets)

		# Temporary hack until we have migrated to asm-powerpc
		include/asm: include3/asm
		include3/asm:
		$(Q)if [ ! -d include3 ]; then mkdir -p include3; fi
		$(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm

		# Use the file '.tmp_gas_check' for binutils tests, as gas won't output
		# to stdout and these checks are run even on install targets.
		TOUT := .tmp_gas_check

+9 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,8 @@ LDFLAGS := -m elf64ppc
		LDFLAGS_vmlinux := -Bstatic -e $(KERNELLOAD) -Ttext $(KERNELLOAD)
		CFLAGS += -msoft-float -pipe -mminimal-toc -mtraceback=none \
		-mcall-aixdesc
		# Temporary hack until we have migrated to asm-powerpc
		CPPFLAGS += -Iinclude3

		GCC_VERSION := $(call cc-version)
		GCC_BROKEN_VEC := $(shell if [ $(GCC_VERSION) -lt 0400 ] ; then echo "y"; fi ;)
		@@ -112,6 +114,7 @@ all: $(KBUILD_IMAGE)

		archclean:
		$(Q)$(MAKE) $(clean)=$(boot)
		$(Q)rm -rf include3

		prepare: include/asm-ppc64/offsets.h

		@@ -121,6 +124,12 @@ arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \
		include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s
		$(call filechk,gen-asm-offsets)

		# Temporary hack until we have migrated to asm-powerpc
		include/asm: include3/asm
		include3/asm:
		$(Q)if [ ! -d include3 ]; then mkdir -p include3; fi;
		$(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm

		define archhelp
		echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
		echo ' zImage.initrd- Compressed kernel image with initrd attached,'

+3 −3

Original line number	Diff line number	Diff line
		@@ -103,10 +103,10 @@ CONFIG_PREEMPT_NONE=y
		# CONFIG_PREEMPT_VOLUNTARY is not set
		# CONFIG_PREEMPT is not set
		# CONFIG_PREEMPT_BKL is not set
		CONFIG_HZ_100=y
		# CONFIG_HZ_250 is not set
		# CONFIG_HZ_100 is not set
		CONFIG_HZ_250=y
		# CONFIG_HZ_1000 is not set
		CONFIG_HZ=100
		CONFIG_HZ=250
		CONFIG_GENERIC_HARDIRQS=y
		CONFIG_SECCOMP=y
		CONFIG_ISA_DMA_API=y

+3 −3

Original line number	Diff line number	Diff line
		@@ -94,10 +94,10 @@ CONFIG_PREEMPT_NONE=y
		# CONFIG_PREEMPT_VOLUNTARY is not set
		# CONFIG_PREEMPT is not set
		# CONFIG_PREEMPT_BKL is not set
		CONFIG_HZ_100=y
		# CONFIG_HZ_250 is not set
		# CONFIG_HZ_100 is not set
		CONFIG_HZ_250=y
		# CONFIG_HZ_1000 is not set
		CONFIG_HZ=100
		CONFIG_HZ=250
		CONFIG_GENERIC_HARDIRQS=y
		CONFIG_LPARCFG=y
		CONFIG_SECCOMP=y

+3 −3

Original line number	Diff line number	Diff line
		@@ -103,10 +103,10 @@ CONFIG_PREEMPT_NONE=y
		# CONFIG_PREEMPT_VOLUNTARY is not set
		# CONFIG_PREEMPT is not set
		# CONFIG_PREEMPT_BKL is not set
		CONFIG_HZ_100=y
		# CONFIG_HZ_250 is not set
		# CONFIG_HZ_100 is not set
		CONFIG_HZ_250=y
		# CONFIG_HZ_1000 is not set
		CONFIG_HZ=100
		CONFIG_HZ=250
		CONFIG_GENERIC_HARDIRQS=y
		CONFIG_SECCOMP=y
		CONFIG_ISA_DMA_API=y