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=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 55D55C433E7 for ; Fri, 16 Oct 2020 02:48:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0B2812087D for ; Fri, 16 Oct 2020 02:48:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602816520; bh=T+KSVLW0CtKXuHJFkCWzj/3QsjxObjKS5AWx0E+8b64=; h=Date:From:To:Subject:In-Reply-To:Reply-To:List-ID:From; b=QRK0wAhB7y84mJ1icbkkt1RZ7VNRWe9TQ+wLubAthQFYsU6BERdBCttzYqz80aGa/ bXDQJ10FwBOJEOIkgyjmsBFIrEjtKC0DJvwEAAqOieEu9hGQphZhSnms16l/0xf5EG 1T3ecQGLJYB/8YwWZBIpznm2LjgBm0KoP81MOv3k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393919AbgJPCsj (ORCPT ); Thu, 15 Oct 2020 22:48:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:36310 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388865AbgJPCsj (ORCPT ); Thu, 15 Oct 2020 22:48:39 -0400 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3948F20897; Fri, 16 Oct 2020 02:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602816517; bh=T+KSVLW0CtKXuHJFkCWzj/3QsjxObjKS5AWx0E+8b64=; h=Date:From:To:Subject:In-Reply-To:From; b=sUvUabrGnbS6cjEJtK1pip7OKOLHk9kUxBQ9e1allnn0zbargHuPAHNWxgTXEJijI rzhtmisfAAcgCLXRqHEXbloldAGR2anIaAJqqvmV7ItvZ3ecy49vrEI5oqekUWOXSP 4VrifkYDFryQvZ4cJxP13auWdw51rfqnoiEA2LQQ= Date: Thu, 15 Oct 2020 19:48:36 -0700 From: Andrew Morton To: akpm@linux-foundation.org, andriy.shevchenko@linux.intel.com, christian.brauner@ubuntu.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, richard.weiyang@linux.alibaba.com, torvalds@linux-foundation.org Subject: [patch 120/156] bitops: use the same mechanism for get_count_order[_long] Message-ID: <20201016024836.Zq4o-F-ua%akpm@linux-foundation.org> In-Reply-To: <20201015192732.f448da14e9854c7cb7299956@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org From: Wei Yang Subject: bitops: use the same mechanism for get_count_order[_long] These two functions share the same logic. Link: https://lkml.kernel.org/r/20200807085837.11697-3-richard.weiyang@linux.alibaba.com Signed-off-by: Wei Yang Cc: Christian Brauner Cc: Andy Shevchenko Signed-off-by: Andrew Morton --- include/linux/bitops.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) --- a/include/linux/bitops.h~bitops-use-the-same-mechanism-for-get_count_order +++ a/include/linux/bitops.h @@ -188,12 +188,10 @@ static inline unsigned fls_long(unsigned static inline int get_count_order(unsigned int count) { - int order; + if (count == 0) + return -1; - order = fls(count) - 1; - if (count & (count - 1)) - order++; - return order; + return fls(--count); } /** _