From patchwork Tue Apr 23 03:21:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 162630 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3305349jan; Mon, 22 Apr 2019 20:22:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqyEpTT7rrqmRe/iUXNhI1n0RjanZLdvSLIySl36jFEoH28RdFXsBt2sM/ithaFA81eH3KfY X-Received: by 2002:a17:902:8f88:: with SMTP id z8mr16518091plo.54.1555989779250; Mon, 22 Apr 2019 20:22:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555989779; cv=none; d=google.com; s=arc-20160816; b=y7aG5PrOFhsjxeDu/JqQ4ArcaIWER1wQwe+zRttkabsB9bwdiyVQBJDGLObNtAYbCZ KUi98BxzBTSXl1lj+kI4TkYpWpuPmqGp+128s/6q6Byn+dZ2EpV86vb3v/3qd6FnWvjY ipo7jzUExS+k4prwcb9SHYOh01n8UUrxJx53DifQIIdAyTS6pWa2a6KsuXFyYUxa05Ny cBptBMFaeRsivZbUGKPVVszz3MuUehc5fWFDVjhouHqc0cyAR0I0BCEk1W3+3+Cj57ID 4LkSx8wttiBxNZXYSMqSyI9/4V37Q1hfAZgmBXVRoCDw+y67k1NcO37u1rdz/6269GDu QItw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=h+EwU9qqdYxQmwoBR4Te9yGMUTWayFtr2mQvRUGDY+4=; b=L2v3ZiDHxWDueJYonU1epEQ1H3X3lf5FVqlA4greHbIBUATO7ZBv+efGHb6ZPYghtd Z+aZ2MlV8hkvDX26AN5Gl1ldRF1iCeEuqMsnkyVdroCI2SBy3x4ZW/5Fi11vCo9hCWR+ QYHhMvTY5wySWt15NveG+fzfCAtwJxXMgQe0Vps3OWH0Uw8lkDgIofdePYmsKNQeMEvb wTb3p1Msoa06wPIUctFEnGOMFQblL/kdnFLDNpa27Fyt66JYy0slwcNe8BEjKqW+XF/g E77NYDN2pgixqrR4+FZmvVVRwblR5oAmWGm57JHtGas3/vQ1IZfcWctiEBcVzSCi2Jdk 4CGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=fMKCLsF3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d9si14742841pls.12.2019.04.22.20.22.58; Mon, 22 Apr 2019 20:22:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=fMKCLsF3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731463AbfDWDW5 (ORCPT + 30 others); Mon, 22 Apr 2019 23:22:57 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:57976 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731424AbfDWDWz (ORCPT ); Mon, 22 Apr 2019 23:22:55 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x3N3L8LG031384; Tue, 23 Apr 2019 12:21:14 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x3N3L8LG031384 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1555989674; bh=h+EwU9qqdYxQmwoBR4Te9yGMUTWayFtr2mQvRUGDY+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fMKCLsF3vkn9rbVZhxunvSAMM1Ddyvfw4vhVutiax7d6r5MGg5J+w/v+g9LBr5+MI ieWoiaS1OLlFVtp+QKr0m9JEjPoY+8pPmRdg5b44U9460ffFvLQwmFSJFE4jOGbWxx PDkpXqS8Z/ZQOHY0KUZ6uRXCdkke35qzo4RTbqWEWQp3vat0X3qNniNDLni4YzgSJU 4QMbOozCm1B4Y8AaI55Utaqe1HTzhYbq57WwpNrAxlZD1CHDTqpd+8GKFaCBkdbiuM gT43p76B4VW4DY3pieAT65tbDDC1nN6ToA5XhujC/nwH8MPSUYMhuIay6PnMr+TD3/ k2XbmcHB78PYg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Andrew Morton , linux-arch Cc: linux-s390@vger.kernel.org, Heiko Carstens , Arnd Bergmann , linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, Ingo Molnar , linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Christophe Leroy , Mathieu Malaterre , Masahiro Yamada Subject: [PATCH v3 05/10] MIPS: mark __fls() and __ffs() as __always_inline Date: Tue, 23 Apr 2019 12:21:01 +0900 Message-Id: <20190423032106.11960-6-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190423032106.11960-1-yamada.masahiro@socionext.com> References: <20190423032106.11960-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This prepares to move CONFIG_OPTIMIZE_INLINING from x86 to a common place. We need to eliminate potential issues beforehand. If it is enabled for mips, the following errors are reported: arch/mips/mm/sc-mips.o: In function `mips_sc_prefetch_enable.part.2': sc-mips.c:(.text+0x98): undefined reference to `mips_gcr_base' sc-mips.c:(.text+0x9c): undefined reference to `mips_gcr_base' sc-mips.c:(.text+0xbc): undefined reference to `mips_gcr_base' sc-mips.c:(.text+0xc8): undefined reference to `mips_gcr_base' sc-mips.c:(.text+0xdc): undefined reference to `mips_gcr_base' arch/mips/mm/sc-mips.o:sc-mips.c:(.text.unlikely+0x44): more undefined references to `mips_gcr_base' Signed-off-by: Masahiro Yamada --- Changes in v3: - forcibly inline __ffs() too Changes in v2: - new patch arch/mips/include/asm/bitops.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/arch/mips/include/asm/bitops.h b/arch/mips/include/asm/bitops.h index 830c93a010c3..9a466dde9b96 100644 --- a/arch/mips/include/asm/bitops.h +++ b/arch/mips/include/asm/bitops.h @@ -482,7 +482,7 @@ static inline void __clear_bit_unlock(unsigned long nr, volatile unsigned long * * Return the bit position (0..63) of the most significant 1 bit in a word * Returns -1 if no 1 bit exists */ -static inline unsigned long __fls(unsigned long word) +static __always_inline unsigned long __fls(unsigned long word) { int num; @@ -548,7 +548,7 @@ static inline unsigned long __fls(unsigned long word) * Returns 0..SZLONG-1 * Undefined if no bit exists, so code should check against 0 first. */ -static inline unsigned long __ffs(unsigned long word) +static __always_inline unsigned long __ffs(unsigned long word) { return __fls(word & -word); }