From patchwork Thu Feb 20 11:08:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1241358 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=sparclinux-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.a=rsa-sha256 header.s=dec2015msa header.b=ohxozsMk; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48NX1k0fplz9sRN for ; Thu, 20 Feb 2020 22:10:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727545AbgBTLKO (ORCPT ); Thu, 20 Feb 2020 06:10:14 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:60149 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726501AbgBTLKO (ORCPT ); Thu, 20 Feb 2020 06:10:14 -0500 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id 01KB8BM7031854; Thu, 20 Feb 2020 20:08:12 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 01KB8BM7031854 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1582196893; bh=IDIlSd5PyoZKAMfckRhRo9czWMeumqnauQZkG16ECr0=; h=From:To:Cc:Subject:Date:From; b=ohxozsMkZQqPJSG/vE4fd4Pi9I/Isldb/uNqGLS2y3mmJU+lGT3bo9VXLfM96rxru x/5s5ExU0483f5Ot70D29mQXggg9PZqGFytLabUrgYvyNhru0n1U6yL4Lgw0pfovI2 HfLY5djw3co/fTp1PlMaARayvrQa8i34RteGbiN8eq0zdZUuUuu3bAPxpyYTomc1zb oHrCln3XXkZ/QYucxcJIHhbaGNUj6yanRzgsgapEFjpi20A8/haFxfS/qq5+0LYtfb AoHEyAiVktt2GJHmyetd/Mh8nM4P1eL1LcjMJDvcsHFzIKPEaIUMHXn6sUM0xA3xqd IlHlcR2LtaAOg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Andrew Morton Cc: Arnd Bergmann , Ingo Molnar , Thomas Gleixner , x86@kernel.org, clang-built-linux@googlegroups.com, Miguel Ojeda , sparclinux@vger.kernel.org, Masahiro Yamada , Andy Lutomirski , Borislav Petkov , "David S. Miller" , "H. Peter Anvin" , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] sparc, x86: vdso: remove meaningless undefining CONFIG_OPTIMIZE_INLINING Date: Thu, 20 Feb 2020 20:08:06 +0900 Message-Id: <20200220110807.32534-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org The code, #undef CONFIG_OPTIMIZE_INLINING, is not working as expected because is parsed before vclock_gettime.c since 28128c61e08e ("kconfig.h: Include compiler types to avoid missed struct attributes"). Since then, is included really early by using the '-include' option. So, you cannot negate the decision of in this way. You can confirm it by checking the pre-processed code, like this: $ make arch/x86/entry/vdso/vdso32/vclock_gettime.i There is no difference with/without CONFIG_CC_OPTIMIZE_FOR_SIZE. It is about two years since 28128c61e08e. Nobody has reported a problem (or, nobody has even noticed the fact that this code is not working). It is ugly and unreliable to attempt to undefine a CONFIG option from C files, and anyway the inlining heuristic is up to the compiler. Just remove the broken code. Signed-off-by: Masahiro Yamada Acked-by: Miguel Ojeda Reviewed-by: Nathan Chancellor --- Changes in v2: - fix a type - add Acked-by arch/sparc/vdso/vdso32/vclock_gettime.c | 4 ---- arch/x86/entry/vdso/vdso32/vclock_gettime.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/arch/sparc/vdso/vdso32/vclock_gettime.c b/arch/sparc/vdso/vdso32/vclock_gettime.c index 026abb3b826c..d7f99e6745ea 100644 --- a/arch/sparc/vdso/vdso32/vclock_gettime.c +++ b/arch/sparc/vdso/vdso32/vclock_gettime.c @@ -4,10 +4,6 @@ #define BUILD_VDSO32 -#ifndef CONFIG_CC_OPTIMIZE_FOR_SIZE -#undef CONFIG_OPTIMIZE_INLINING -#endif - #ifdef CONFIG_SPARC64 /* diff --git a/arch/x86/entry/vdso/vdso32/vclock_gettime.c b/arch/x86/entry/vdso/vdso32/vclock_gettime.c index 9242b28418d5..3c26488db94d 100644 --- a/arch/x86/entry/vdso/vdso32/vclock_gettime.c +++ b/arch/x86/entry/vdso/vdso32/vclock_gettime.c @@ -1,10 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #define BUILD_VDSO32 -#ifndef CONFIG_CC_OPTIMIZE_FOR_SIZE -#undef CONFIG_OPTIMIZE_INLINING -#endif - #ifdef CONFIG_X86_64 /*