From patchwork Thu Feb 18 04:05:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 12093009 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 41CBCC4332D for ; Thu, 18 Feb 2021 04:06:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0058C64E79 for ; Thu, 18 Feb 2021 04:06:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230295AbhBREGn (ORCPT ); Wed, 17 Feb 2021 23:06:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230281AbhBREGm (ORCPT ); Wed, 17 Feb 2021 23:06:42 -0500 Received: from mail-qv1-xf31.google.com (mail-qv1-xf31.google.com [IPv6:2607:f8b0:4864:20::f31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F593C06178C; Wed, 17 Feb 2021 20:05:20 -0800 (PST) Received: by mail-qv1-xf31.google.com with SMTP id gi9so357119qvb.10; Wed, 17 Feb 2021 20:05:20 -0800 (PST) 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=JJENUVTTVrzVSsRoDJyoUWRsHsS22gYzvu4pIcEBs2g=; b=cNJUvLFqphk0K/lqrq0Qjn312xs1KS/3LK1bGTa2ELl9lD7az5WCGmCXVfKWK+5r7c ZtT/USGeWcVn+HKxgmLxPOP6UQFVJa0PNXbaO2nRqBjcowYlIBCFPW+Wm2l9qlhw77u1 wuWJqmcMjZkG/GtkEqRpgYv3CHz5W1SqXk/E8aHXvVIEqht/2dCNBJo/HaIJgBI3bD8V 7iyCFP+tN1/YPyLgotriolwMI25DHmzh7EEBv5kFZXhMHrYOaTOA4EyqiED4CbbuCdgB rnw6Qc4epf9pIxgL22Qq6Ml0RJxgZXdCSZC3ssNnoYSlLO/wxAIUBmo8ZDv9P2bxhu8o eEOg== 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=JJENUVTTVrzVSsRoDJyoUWRsHsS22gYzvu4pIcEBs2g=; b=ItCQAu2cpvijbPc1IWJm+S9uLmT+StUFPh5LP6SMBDx50hYKuR9NUFnXvtxqOhs3Ei X6N/lDUGxBMTzBIofy0hLWylVLcF6D7iKJ9TD7zgrUT9e13LkYxahqRa2xXheOnLwhss gw1CXHq1B8viVrI/bFZIzsUNm/H3c8EptfLMadFw9658kBptRnEmcrTaIHUQKOfn0Nzm oY7+j/z5D0+g91ergNWc4P2lq27L+5Tn2rIWF79j8ss5CUdHcn/oyq3wJLaM9DlP1Z5b bUfrFEN7uc31JUwpIaFO0fnc9Wdn2WLl2kjL83o0PpMz6olXiQgawzjKVE13+CIOG9a9 yjmA== X-Gm-Message-State: AOAM531lrX0gMcoWOnp96H1gSn5dlBp/cbbmg6xaxsu5UTOgcq1IuOnZ 0o74dO/7mG+Ip8xCE9WSuDG3Tcr3J4seOQ== X-Google-Smtp-Source: ABdhPJy0+QbSdvRColmCZHyYPmh/qO2RwqalAYB5I6htKRTN4sc2ZFQ9tkLgGhBq4G8GGqGf5zkcMg== X-Received: by 2002:a0c:fb41:: with SMTP id b1mr2589507qvq.26.1613621119021; Wed, 17 Feb 2021 20:05:19 -0800 (PST) Received: from localhost (d27-96-190-162.evv.wideopenwest.com. [96.27.162.190]) by smtp.gmail.com with ESMTPSA id e92sm2554283qtd.96.2021.02.17.20.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 20:05:18 -0800 (PST) From: Yury Norov To: linux-kernel@vger.kernel.org Cc: Yury Norov , linux-m68k@lists.linux-m68k.org, linux-arch@vger.kernel.org, linux-sh@vger.kernel.org, Alexey Klimov , Andrew Morton , 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 03/14] arch: rearrange headers inclusion order in asm/bitops for m68k and sh Date: Wed, 17 Feb 2021 20:05:01 -0800 Message-Id: <20210218040512.709186-4-yury.norov@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210218040512.709186-1-yury.norov@gmail.com> References: <20210218040512.709186-1-yury.norov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org m68k and sh include bitmap/find.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 --- arch/m68k/include/asm/bitops.h | 4 ++-- arch/sh/include/asm/bitops.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h index 10133a968c8e..093590c9e70f 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) @@ -531,4 +529,6 @@ static inline int __fls(int x) #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..792bbe1237dc 100644 --- a/arch/sh/include/asm/bitops.h +++ b/arch/sh/include/asm/bitops.h @@ -58,7 +58,6 @@ static inline unsigned long __ffs(unsigned long word) return result; } -#include #include #include #include @@ -69,4 +68,6 @@ static inline unsigned long __ffs(unsigned long word) #include #include +#include + #endif /* __ASM_SH_BITOPS_H */