Merge branch 'topic/func-desc-lkdtm' into next

[platform/kernel/linux-starfive.git] / arch / powerpc / Makefile

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index e499f60..eb541e7 100644 (file)
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -171,7 +171,7 @@ else
 CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power7,$(call cc-option,-mtune=power5))
 CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mcpu=power5,-mcpu=power4)
 endif
-else
+else ifdef CONFIG_PPC_BOOK3E_64
 CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
 endif
 
@@ -421,9 +421,9 @@ ifeq ($(KBUILD_EXTMOD),)
 prepare: vdso_prepare
 vdso_prepare: prepare0
        $(if $(CONFIG_VDSO32),$(Q)$(MAKE) \
-               $(build)=arch/powerpc/kernel/vdso32 include/generated/vdso32-offsets.h)
+               $(build)=arch/powerpc/kernel/vdso include/generated/vdso32-offsets.h)
        $(if $(CONFIG_PPC64),$(Q)$(MAKE) \
-               $(build)=arch/powerpc/kernel/vdso64 include/generated/vdso64-offsets.h)
+               $(build)=arch/powerpc/kernel/vdso include/generated/vdso64-offsets.h)
 endif
 
 archprepare: checkbin