Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756213AbbBHOLu (ORCPT ); Sun, 8 Feb 2015 09:11:50 -0500 Received: from mail-lb0-f170.google.com ([209.85.217.170]:39382 "EHLO mail-lb0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755678AbbBHOLr (ORCPT ); Sun, 8 Feb 2015 09:11:47 -0500 From: Yury Norov To: klimov.linux@gmail.com, davem@davemloft.net, akpm@linux-foundation.org, hannes@stressinduktion.org, dborkman@redhat.com, laijs@cn.fujitsu.com, takahiro.akashi@linaro.org, valentinrothberg@gmail.com, linux@horizon.com, msalter@redhat.com, chris@chris-wilson.co.uk, tgraf@suug.ch Cc: Yury Norov , linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] lib: move find_last_bit to lib/find_next_bit.c Date: Sun, 8 Feb 2015 17:10:18 +0300 Message-Id: <1423404619-10653-3-git-send-email-yury.norov@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1423404619-10653-1-git-send-email-yury.norov@gmail.com> References: <1423404619-10653-1-git-send-email-yury.norov@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3736 Lines: 114 Currently all 'find_*_bit' family is located in lib/find_next_bit.c, except 'find_last_bit', which is in lib/find_last_bit.c. It seems, there's no major benefit to have it separated. Signed-off-by: Yury Norov --- lib/Makefile | 2 +- lib/find_last_bit.c | 35 ----------------------------------- lib/find_next_bit.c | 21 ++++++++++++++++++++- 3 files changed, 21 insertions(+), 37 deletions(-) delete mode 100644 lib/find_last_bit.c diff --git a/lib/Makefile b/lib/Makefile index 3c3b30b..13990aa 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -25,7 +25,7 @@ obj-y += lockref.o obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \ bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o \ gcd.o lcm.o list_sort.o uuid.o flex_array.o iovec.o clz_ctz.o \ - bsearch.o find_last_bit.o find_next_bit.o llist.o memweight.o kfifo.o \ + bsearch.o find_next_bit.o llist.o memweight.o kfifo.o \ percpu-refcount.o percpu_ida.o rhashtable.o reciprocal_div.o obj-y += string_helpers.o obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o diff --git a/lib/find_last_bit.c b/lib/find_last_bit.c deleted file mode 100644 index 106050f..0000000 --- a/lib/find_last_bit.c +++ /dev/null @@ -1,35 +0,0 @@ -/* find_last_bit.c: fallback find next bit implementation - * - * Copyright (C) 2008 IBM Corporation - * Written by Rusty Russell - * (Inspired by David Howell's find_next_bit implementation) - * - * Rewritten by Yury Norov to decrease - * size and improve performance, 2015. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ - -#include -#include -#include - -#ifndef find_last_bit - -unsigned long find_last_bit(const unsigned long *addr, unsigned long size) -{ - unsigned long idx = DIV_ROUND_UP(size, BITS_PER_LONG); - - while (idx--) { - if (addr[idx]) - return min(idx * BITS_PER_LONG + __fls(addr[idx]), size); - } - - return size; -} -EXPORT_SYMBOL(find_last_bit); - -#endif diff --git a/lib/find_next_bit.c b/lib/find_next_bit.c index 71aa497..5ec0ab9 100644 --- a/lib/find_next_bit.c +++ b/lib/find_next_bit.c @@ -1,8 +1,12 @@ -/* find_next_bit.c: fallback find next bit implementation +/* bit search implementation * * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. * Written by David Howells (dhowells@redhat.com) * + * Copyright (C) 2008 IBM Corporation + * 'find_last_bit' is written by Rusty Russell + * (Inspired by David Howell's find_next_bit implementation) + * * Rewritten by Yury Norov to decrease * size and improve performance, 2015. * @@ -114,6 +118,21 @@ unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size) EXPORT_SYMBOL(find_first_zero_bit); #endif +#ifndef find_last_bit +unsigned long find_last_bit(const unsigned long *addr, unsigned long size) +{ + unsigned long idx = DIV_ROUND_UP(size, BITS_PER_LONG); + + while (idx--) { + if (addr[idx]) + return min(idx * BITS_PER_LONG + __fls(addr[idx]), size); + } + + return size; +} +EXPORT_SYMBOL(find_last_bit); +#endif + #ifdef __BIG_ENDIAN /* include/linux/byteorder does not support "unsigned long" type */ -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/