From owner-svn-src-all@FreeBSD.ORG Mon Jun 16 20:43:44 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 19C49670; Mon, 16 Jun 2014 20:43:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E056E2C30; Mon, 16 Jun 2014 20:43:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5GKhhSi017510; Mon, 16 Jun 2014 20:43:43 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5GKhheI017509; Mon, 16 Jun 2014 20:43:43 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201406162043.s5GKhheI017509@svn.freebsd.org> From: Hans Petter Selasky Date: Mon, 16 Jun 2014 20:43:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r267555 - stable/9/sys/ofed/include/linux X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jun 2014 20:43:44 -0000 Author: hselasky Date: Mon Jun 16 20:43:43 2014 New Revision: 267555 URL: http://svnweb.freebsd.org/changeset/base/267555 Log: MFC r254120, r257862 and r267395: - Fix out of range shifting bug in bitops.h. - Make code a bit easier to read by adding parenthesis. Approved by: re, gjb @ Modified: stable/9/sys/ofed/include/linux/bitops.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/ofed/include/linux/bitops.h ============================================================================== --- stable/9/sys/ofed/include/linux/bitops.h Mon Jun 16 20:21:15 2014 (r267554) +++ stable/9/sys/ofed/include/linux/bitops.h Mon Jun 16 20:43:43 2014 (r267555) @@ -272,23 +272,26 @@ bitmap_empty(unsigned long *addr, int si return (1); } -#define NBINT (NBBY * sizeof(int)) +#define NBLONG (NBBY * sizeof(long)) #define set_bit(i, a) \ - atomic_set_int(&((volatile int *)(a))[(i)/NBINT], 1 << (i) % NBINT) + atomic_set_long(&((volatile long *)(a))[(i)/NBLONG], 1UL << ((i) % NBLONG)) #define clear_bit(i, a) \ - atomic_clear_int(&((volatile int *)(a))[(i)/NBINT], 1 << (i) % NBINT) + atomic_clear_long(&((volatile long *)(a))[(i)/NBLONG], 1UL << ((i) % NBLONG)) #define test_bit(i, a) \ - !!(atomic_load_acq_int(&((volatile int *)(a))[(i)/NBINT]) & 1 << ((i) % NBINT)) + !!(atomic_load_acq_long(&((volatile long *)(a))[(i)/NBLONG]) & \ + (1UL << ((i) % NBLONG))) static inline long test_and_clear_bit(long bit, long *var) { long val; - bit = 1 << bit; + var += bit / (sizeof(long) * NBBY); + bit %= sizeof(long) * NBBY; + bit = (1UL << bit); do { val = *(volatile long *)var; } while (atomic_cmpset_long(var, val, val & ~bit) == 0); @@ -301,7 +304,9 @@ test_and_set_bit(long bit, long *var) { long val; - bit = 1 << bit; + var += bit / (sizeof(long) * NBBY); + bit %= sizeof(long) * NBBY; + bit = (1UL << bit); do { val = *(volatile long *)var; } while (atomic_cmpset_long(var, val, val | bit) == 0);