From patchwork Mon Apr 29 05:40:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chanho Min X-Patchwork-Id: 240324 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 140102C009B for ; Mon, 29 Apr 2013 15:40:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751043Ab3D2Fk1 (ORCPT ); Mon, 29 Apr 2013 01:40:27 -0400 Received: from LGEMRELSE1Q.lge.com ([156.147.1.111]:62239 "EHLO LGEMRELSE1Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751001Ab3D2Fk0 (ORCPT ); Mon, 29 Apr 2013 01:40:26 -0400 X-AuditID: 9c93016f-b7c3dae000000592-7a-517e07c5d250 Received: from localhost.localdomain ( [10.178.36.63]) by LGEMRELSE1Q.lge.com (Symantec Brightmail Gateway) with SMTP id 2F.24.01426.5C70E715; Mon, 29 Apr 2013 14:40:21 +0900 (KST) From: Chanho Min To: Andrew Morton Cc: Kyungsik Lee , Yann Collet , Bob Pearson , Richard Weinberger , Geert Uytterhoeven , linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linux-m68k@vger.kernel.org, linux-next@vger.kernel.org, Chanho Min Subject: [PATCH] lib: add weak __clzsi2()/__clzdi2() functions Date: Mon, 29 Apr 2013 14:40:05 +0900 Message-Id: <1367214005-14302-1-git-send-email-chanho.min@lge.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: AAAAAA== Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Some architectures need __clzsi2() or __clzdi2() for __builtin_clz and It causes build failure. They can be implemented using the fls() and overridden by linking arch-specific versions may not be implemented yet. Reference: https://lkml.org/lkml/2013/4/18/603 Reported-by: Geert Uytterhoeven Signed-off-by: Chanho Min Acked-by: Geert Uytterhoeven --- lib/Makefile | 2 +- lib/clz.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 lib/clz.c diff --git a/lib/Makefile b/lib/Makefile index af79e8c..e17b3ee 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -23,7 +23,7 @@ lib-y += kobject.o klist.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 \ + gcd.o lcm.o list_sort.o uuid.o flex_array.o clz.o\ bsearch.o find_last_bit.o find_next_bit.o llist.o memweight.o kfifo.o obj-y += string_helpers.o obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o diff --git a/lib/clz.c b/lib/clz.c new file mode 100644 index 0000000..5222b2d --- /dev/null +++ b/lib/clz.c @@ -0,0 +1,36 @@ +/* + * lib/clz.c + * + * Copyright (C) 2013 Chanho Min + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * __clzsi2/_clzdi2() can be overridden by linking arch-specific versions. + */ + +#include +#include + +int __weak __clzsi2(int val) +{ + return BITS_PER_LONG - fls(val); +} +EXPORT_SYMBOL(__clzsi2); + +#if BITS_PER_LONG == 32 +int __weak __clzdi2(long val) +{ + return BITS_PER_LONG - fls((int)val); +} +EXPORT_SYMBOL(__clzdi2); +#elif BITS_PER_LONG == 64 +int __weak __clzdi2i(long val) +{ + return BITS_PER_LONG - fls64((u64)val); +} +EXPORT_SYMBOL(__clzdi2); +#else +#error BITS_PER_LONG not 32 or 64 +#endif