From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 03 Feb 2006 01:23:46 +0000 (GMT) Received: from ns.miraclelinux.com ([219.118.163.66]:29255 "EHLO mail01.miraclelinux.com") by ftp.linux-mips.org with ESMTP id S8133427AbWBCBW0 (ORCPT ); Fri, 3 Feb 2006 01:22:26 +0000 Received: from mail01 (localhost.localdomain [127.0.0.1]) by mail01.miraclelinux.com (Postfix) with ESMTP id 2D14031C2DA; Fri, 3 Feb 2006 10:27:37 +0900 (JST) Received: from localhost.localdomain (sshgate.miraclelinux.com []) by mail01.miraclelinux.com ([10.1.0.10]); Fri, 03 Feb 2006 01:27:37 +0000 Received: by localhost.localdomain (Postfix, from userid 1000) id 34BC54201E0; Fri, 3 Feb 2006 10:27:35 +0900 (JST) Date: Fri, 3 Feb 2006 10:27:35 +0900 To: Rune Torgersen Cc: linux-kernel@vger.kernel.org, linux-mips@linux-mips.org, linux-ia64@vger.kernel.org, Ian Molton , David Howells , linuxppc-dev@ozlabs.org, Greg Ungerer , sparclinux@vger.kernel.org, Miles Bader , Linus Torvalds , Yoshinori Sato , Hirokazu Takata , linuxsh-shmedia-dev@lists.sourceforge.net, linux-m68k@lists.linux-m68k.org, Ivan Kokshaysky , Richard Henderson , Chris Zankel , dev-etrax@axis.com, ultralinux@vger.kernel.org, Andi Kleen , linuxsh-dev@lists.sourceforge.net, linux390@de.ibm.com, Russell King , parisc-linux@parisc-linux.org, akpm@osdl.org, Stephen Hemminger Subject: [PATCH] fix generic_fls64() Message-ID: <20060203012735.GA21567@miraclelinux.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.9i From: mita@miraclelinux.com (Akinobu Mita) Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 10316 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: mita@miraclelinux.com Precedence: bulk X-list: linux-mips Noticed by Rune Torgersen. fix generic_fls64(). tcp_cubic is using fls64(). Signed-off-by: Akinobu Mita include/linux/bitops.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: 2.6-git/include/linux/bitops.h =================================================================== --- 2.6-git.orig/include/linux/bitops.h +++ 2.6-git/include/linux/bitops.h @@ -81,7 +81,7 @@ static inline int generic_fls64(__u64 x) { __u32 h = x >> 32; if (h) - return fls(x) + 32; + return fls(h) + 32; return fls(x); }