From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,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 89930C4363E for ; Thu, 1 Apr 2021 00:33:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 65CDF6108B for ; Thu, 1 Apr 2021 00:33:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232930AbhDAAc3 (ORCPT ); Wed, 31 Mar 2021 20:32:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232915AbhDAAcB (ORCPT ); Wed, 31 Mar 2021 20:32:01 -0400 Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 413A9C06175F; Wed, 31 Mar 2021 17:32:01 -0700 (PDT) Received: by mail-qk1-x736.google.com with SMTP id o5so738267qkb.0; Wed, 31 Mar 2021 17:32:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7uuPJmp4KPyBUDIxFDzyUQbihYygKnVYzuD8q2fLg24=; b=tnUuHzaTi5SHfRkAYnEcSS+yZMuArFiYAEsm6VW7UMu0JYpEEqe5parUy9bXUbzwBC PIHYusMQt+gL4hBuInRuwDFW1WYBwtsZPNWwkn7RxTjS/jnU1e8ryGBtiPcRliB2JCX2 nvJGAmlPRl57ynCUgC4GquzSUGt3B0qQbvf19gndonphmYKUsB8eEgSyYSyjA8VZTfZY Z4wB7uBn3ImDRworXxm81JUcSLPKzD4kngXHvONLAQLJY2nTmz+OVphQCjgDBddnvUwC VbwgIlPRCegHF/+ZxOueMIj7GGB6n7EyjcuMFGu2Kdoleav4gOs8Pum1Qlm9wbDXhVaJ h4CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7uuPJmp4KPyBUDIxFDzyUQbihYygKnVYzuD8q2fLg24=; b=XiS3GV4XZ4rxcvUMr5hLOngkezmpQ+7+SVY+NIcha3JG9oEO9v0slhNyDnCaVn8IsA Rs4uxwZfb1LPGvpa0ahdRDXbFwhdzeOuAYHyRtTJ+/S0iaQQa7Qa23ckQxvuz26w1Lub tFGxP+KGiqc7/xvSDQGZe8qsNMk7/2TICHx/xfjst4TE1l3yb+1t47jCYKRW4bMyBhRP qDYWeXgpS31B1rB0O+pP9OTpGQ1rZfrC25wEYbALYyjDUhE/rYSw+kcMpuDIM2DJ5/KP 8WD7WsGU1OjwUU6ikAH5gdI21GfqrUpiHplb1xA0ymKHYCmklzi/ee+cINOVWumJ9T8m luwg== X-Gm-Message-State: AOAM530PmPqXTuo61iQ0E2FcR5veNSsoMEvT4F5oaAjfmLJnet/LJBcP FDZPRtvMvwtiaO3ukW016BOIOa+nJQN58Q== X-Google-Smtp-Source: ABdhPJzRXLRztd90mQ6oRp5qrd6JMX1GHtY43/lsJOUZ6j2zuF1i9IOLQZIcrDBFEWY8J7Z4qQuhGw== X-Received: by 2002:a37:4017:: with SMTP id n23mr5587513qka.338.1617237120204; Wed, 31 Mar 2021 17:32:00 -0700 (PDT) Received: from localhost ([207.98.216.60]) by smtp.gmail.com with ESMTPSA id d2sm2329793qte.84.2021.03.31.17.31.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 17:31:59 -0700 (PDT) From: Yury Norov To: linux-kernel@vger.kernel.org, Andrew Morton Cc: Yury Norov , linux-m68k@lists.linux-m68k.org, linux-arch@vger.kernel.org, linux-sh@vger.kernel.org, Alexey Klimov , Andy Shevchenko , Arnd Bergmann , David Sterba , Dennis Zhou , Geert Uytterhoeven , Jianpeng Ma , Joe Perches , John Paul Adrian Glaubitz , Josh Poimboeuf , Rasmus Villemoes , Rich Felker , Stefano Brivio , Wei Yang , Wolfram Sang , Yoshinori Sato Subject: [PATCH 04/12] arch: rearrange headers inclusion order in asm/bitops for m68k and sh Date: Wed, 31 Mar 2021 17:31:45 -0700 Message-Id: <20210401003153.97325-5-yury.norov@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210401003153.97325-1-yury.norov@gmail.com> References: <20210401003153.97325-1-yury.norov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org m68k and sh include bitmap/{find,le}.h prior to ffs/fls headers. New fast-path implementation in find.h requires ffs/fls. Reordering the headers inclusion sequence helps to prevent compile-time implicit function declaration error. Signed-off-by: Yury Norov Acked-by: Geert Uytterhoeven Acked-by: Rasmus Villemoes --- arch/m68k/include/asm/bitops.h | 6 +++--- arch/sh/include/asm/bitops.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h index 10133a968c8e..7b414099e5fc 100644 --- a/arch/m68k/include/asm/bitops.h +++ b/arch/m68k/include/asm/bitops.h @@ -440,8 +440,6 @@ static inline unsigned long ffz(unsigned long word) #endif -#include - #ifdef __KERNEL__ #if defined(CONFIG_CPU_HAS_NO_BITFIELDS) @@ -525,10 +523,12 @@ static inline int __fls(int x) #define __clear_bit_unlock clear_bit_unlock #include -#include #include #include #include +#include #endif /* __KERNEL__ */ +#include + #endif /* _M68K_BITOPS_H */ diff --git a/arch/sh/include/asm/bitops.h b/arch/sh/include/asm/bitops.h index 450b5854d7c6..3b6c7b5b7ec9 100644 --- a/arch/sh/include/asm/bitops.h +++ b/arch/sh/include/asm/bitops.h @@ -58,15 +58,16 @@ static inline unsigned long __ffs(unsigned long word) return result; } -#include #include #include #include #include -#include #include #include #include #include +#include +#include + #endif /* __ASM_SH_BITOPS_H */ -- 2.25.1