From patchwork Sat Jul 31 05:57:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12412281 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30E37C4338F for ; Sat, 31 Jul 2021 06:00:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 123B36069E for ; Sat, 31 Jul 2021 06:00:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229766AbhGaGBA (ORCPT ); Sat, 31 Jul 2021 02:01:00 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:43013 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229683AbhGaGA7 (ORCPT ); Sat, 31 Jul 2021 02:00:59 -0400 X-Greylist: delayed 1789 seconds by postgrey-1.27 at vger.kernel.org; Sat, 31 Jul 2021 02:00:59 EDT Received: from localhost.localdomain ([133.106.57.58]) (authenticated) by conuserg-12.nifty.com with ESMTP id 16V5vc6u023849; Sat, 31 Jul 2021 14:57:39 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com 16V5vc6u023849 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1627711060; bh=kbgy+e6+xWYENR319IquT7ksqMD3Pp/VPUYpU/wDMsw=; h=From:To:Cc:Subject:Date:From; b=UMeUDmEBp7Pe6ULmffpzQdudxDWHqtyIw55ItR2H3gT3dotPu+jibOHcSlufO0sIZ 11TJa8ycpXmx80P2YYEbvpaBDrNtNarWAjIT6rTK3dZnNESdLyZgBr2uAPxKC3Mexd haACRhbGC7Z3refVuToRuN0ord/K81BZNKrnt6y2NcXNyskT8ZSBV24zRonUhPCPoS 8TR4V63Q/qYK7G5eZ0j+lenf4lOj7GcHwTPimFpI1bC2via80DAp5PFjvvIE5O0PB2 lVUwZU7JJdrFHYyug8eeBgBfljg+z6PGs67mifx5eEhLmZBXXz8rUVsJlygaveGXEN EVeN+xghrhjrg== X-Nifty-SrcIP: [133.106.57.58] From: Masahiro Yamada To: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , linux-kernel@vger.kernel.org Cc: Masahiro Yamada , Will Deacon , Thomas Bogendoerfer , Palmer Dabbelt , Michael Ellerman , Catalin Marinas , Benjamin Herrenschmidt , linux-mips@vger.kernel.org, Paul Mackerras , linux-riscv@lists.infradead.org, Albert Ou , linuxppc-dev@lists.ozlabs.org, Russell King , linux-arm-kernel@lists.infradead.org, Paul Walmsley Subject: [PATCH] arch: vdso: remove if-conditionals of $(c-gettimeofday-y) Date: Sat, 31 Jul 2021 14:57:33 +0900 Message-Id: <20210731055733.12332-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org arm, arm64, mips, powerpc always select GENERIC_GETTIMEOFDAY, hence $(gettimeofday-y) never becomes empty. riscv conditionally selects GENERIC_GETTIMEOFDAY when MMU=y && 64BIT=y, but arch/riscv/kernel/vdso/vgettimeofday.o is built only under that condition. So, you can always define CFLAGS_vgettimeofday.o Remove all the meaningless conditionals. Signed-off-by: Masahiro Yamada Acked-by: Palmer Dabbelt --- arch/arm/vdso/Makefile | 4 ---- arch/arm64/kernel/vdso/Makefile | 5 +---- arch/arm64/kernel/vdso32/Makefile | 3 --- arch/mips/vdso/Makefile | 2 -- arch/powerpc/kernel/vdso32/Makefile | 14 ++++++-------- arch/powerpc/kernel/vdso64/Makefile | 14 ++++++-------- arch/riscv/kernel/vdso/Makefile | 5 +---- 7 files changed, 14 insertions(+), 33 deletions(-) diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile index 7c9e395b77f7..d996b57ca19d 100644 --- a/arch/arm/vdso/Makefile +++ b/arch/arm/vdso/Makefile @@ -29,11 +29,7 @@ CFLAGS_REMOVE_vdso.o = -pg # Force -O2 to avoid libgcc dependencies CFLAGS_REMOVE_vgettimeofday.o = -pg -Os $(GCC_PLUGINS_CFLAGS) -ifeq ($(c-gettimeofday-y),) -CFLAGS_vgettimeofday.o = -O2 -else CFLAGS_vgettimeofday.o = -O2 -include $(c-gettimeofday-y) -endif # Disable gcov profiling for VDSO code GCOV_PROFILE := n diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile index 945e6bb326e3..5545c28e0e6e 100644 --- a/arch/arm64/kernel/vdso/Makefile +++ b/arch/arm64/kernel/vdso/Makefile @@ -37,10 +37,7 @@ OBJECT_FILES_NON_STANDARD := y KCOV_INSTRUMENT := n CFLAGS_vgettimeofday.o = -O2 -mcmodel=tiny -fasynchronous-unwind-tables - -ifneq ($(c-gettimeofday-y),) - CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) -endif +CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) # Disable gcov profiling for VDSO code GCOV_PROFILE := n diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index 3dba0c4f8f42..330111046afc 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -133,10 +133,7 @@ hostprogs := $(munge) c-obj-vdso := note.o c-obj-vdso-gettimeofday := vgettimeofday.o - -ifneq ($(c-gettimeofday-y),) VDSO_CFLAGS_gettimeofday_o += -include $(c-gettimeofday-y) -endif VDSO_CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile index 1b2ea34c3d3b..c409d551972a 100644 --- a/arch/mips/vdso/Makefile +++ b/arch/mips/vdso/Makefile @@ -36,7 +36,6 @@ cflags-vdso := $(ccflags-vdso) \ aflags-vdso := $(ccflags-vdso) \ -D__ASSEMBLY__ -Wa,-gdwarf-2 -ifneq ($(c-gettimeofday-y),) CFLAGS_vgettimeofday.o = -include $(c-gettimeofday-y) # config-n32-o32-env.c prepares the environment to build a 32bit vDSO @@ -44,7 +43,6 @@ CFLAGS_vgettimeofday.o = -include $(c-gettimeofday-y) # Note: Needs to be included before than the generic library. CFLAGS_vgettimeofday-o32.o = -include $(srctree)/$(src)/config-n32-o32-env.c -include $(c-gettimeofday-y) CFLAGS_vgettimeofday-n32.o = -include $(srctree)/$(src)/config-n32-o32-env.c -include $(c-gettimeofday-y) -endif CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile index 7d9a6fee0e3d..2386abc6fa58 100644 --- a/arch/powerpc/kernel/vdso32/Makefile +++ b/arch/powerpc/kernel/vdso32/Makefile @@ -7,14 +7,12 @@ include $(srctree)/lib/vdso/Makefile obj-vdso32 = sigtramp.o gettimeofday.o datapage.o cacheflush.o note.o getcpu.o -ifneq ($(c-gettimeofday-y),) - CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) - CFLAGS_vgettimeofday.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) - CFLAGS_vgettimeofday.o += $(call cc-option, -fno-stack-protector) - CFLAGS_vgettimeofday.o += -DDISABLE_BRANCH_PROFILING - CFLAGS_vgettimeofday.o += -ffreestanding -fasynchronous-unwind-tables - CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -endif +CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) +CFLAGS_vgettimeofday.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) +CFLAGS_vgettimeofday.o += $(call cc-option, -fno-stack-protector) +CFLAGS_vgettimeofday.o += -DDISABLE_BRANCH_PROFILING +CFLAGS_vgettimeofday.o += -ffreestanding -fasynchronous-unwind-tables +CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) # Build rules diff --git a/arch/powerpc/kernel/vdso64/Makefile b/arch/powerpc/kernel/vdso64/Makefile index 2813e3f98db6..cdf748ebdcde 100644 --- a/arch/powerpc/kernel/vdso64/Makefile +++ b/arch/powerpc/kernel/vdso64/Makefile @@ -6,14 +6,12 @@ include $(srctree)/lib/vdso/Makefile obj-vdso64 = sigtramp.o gettimeofday.o datapage.o cacheflush.o note.o getcpu.o -ifneq ($(c-gettimeofday-y),) - CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) - CFLAGS_vgettimeofday.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) - CFLAGS_vgettimeofday.o += $(call cc-option, -fno-stack-protector) - CFLAGS_vgettimeofday.o += -DDISABLE_BRANCH_PROFILING - CFLAGS_vgettimeofday.o += -ffreestanding -fasynchronous-unwind-tables - CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -endif +CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) +CFLAGS_vgettimeofday.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) +CFLAGS_vgettimeofday.o += $(call cc-option, -fno-stack-protector) +CFLAGS_vgettimeofday.o += -DDISABLE_BRANCH_PROFILING +CFLAGS_vgettimeofday.o += -ffreestanding -fasynchronous-unwind-tables +CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) # Build rules diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile index 24d936c147cd..7653767a6100 100644 --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/kernel/vdso/Makefile @@ -17,10 +17,7 @@ vdso-syms += flush_icache obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o ccflags-y := -fno-stack-protector - -ifneq ($(c-gettimeofday-y),) - CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y) -endif +CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y) # Build rules targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.lds vdso-syms.S