From patchwork Fri Oct 8 10:03:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 67154 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 A763AB70AF for ; Fri, 8 Oct 2010 21:06:07 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757018Ab0JHKGE (ORCPT ); Fri, 8 Oct 2010 06:06:04 -0400 Received: from [150.82.175.143] ([150.82.175.143]:35254 "EHLO dhcpa11143.tky.aist.go.jp" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1756992Ab0JHKGC (ORCPT ); Fri, 8 Oct 2010 06:06:02 -0400 X-Greylist: delayed 322 seconds by postgrey-1.27 at vger.kernel.org; Fri, 08 Oct 2010 06:06:02 EDT Received: from dhcpa11143.tky.aist.go.jp (localhost.localdomain [127.0.0.1]) by dhcpa11143.tky.aist.go.jp (8.13.8/8.13.8) with ESMTP id o98A3TAs029863; Fri, 8 Oct 2010 19:03:29 +0900 Received: (from mita@localhost) by dhcpa11143.tky.aist.go.jp (8.13.8/8.13.8/Submit) id o98A3Stn029862; Fri, 8 Oct 2010 19:03:28 +0900 From: Akinobu Mita To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Arnd Bergmann , Andrew Morton Cc: Akinobu Mita , Andy Grover , rds-devel@oss.oracle.com, "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH 4/5] rds: stop including asm-generic/bitops/le.h directly Date: Fri, 8 Oct 2010 19:03:12 +0900 Message-Id: <1286532193-29814-4-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.1.231.gd0b16 In-Reply-To: <1286532193-29814-1-git-send-email-akinobu.mita@gmail.com> References: <1286532193-29814-1-git-send-email-akinobu.mita@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org asm-generic/bitops/le.h is only intended to be included directly from asm-generic/bitops/ext2-non-atomic.h or asm-generic/bitops/minix-le.h which implements generic ext2 or minix bit operations. This stops including asm-generic/bitops/le.h directly and use ext2 non-atomic bit operations instead. An alternative approach is introducing little endian bit operations in linux/bitops.h. But it needs to touch more files than this change does. Signed-off-by: Akinobu Mita Cc: Andy Grover Cc: rds-devel@oss.oracle.com Cc: "David S. Miller" Cc: netdev@vger.kernel.org --- net/rds/cong.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/net/rds/cong.c b/net/rds/cong.c index 0871a29..5bd0f36 100644 --- a/net/rds/cong.c +++ b/net/rds/cong.c @@ -33,8 +33,7 @@ #include #include #include - -#include +#include #include "rds.h" @@ -285,7 +284,7 @@ void rds_cong_set_bit(struct rds_cong_map *map, __be16 port) i = be16_to_cpu(port) / RDS_CONG_MAP_PAGE_BITS; off = be16_to_cpu(port) % RDS_CONG_MAP_PAGE_BITS; - generic___set_le_bit(off, (void *)map->m_page_addrs[i]); + ext2_set_bit(off, (void *)map->m_page_addrs[i]); } void rds_cong_clear_bit(struct rds_cong_map *map, __be16 port) @@ -299,7 +298,7 @@ void rds_cong_clear_bit(struct rds_cong_map *map, __be16 port) i = be16_to_cpu(port) / RDS_CONG_MAP_PAGE_BITS; off = be16_to_cpu(port) % RDS_CONG_MAP_PAGE_BITS; - generic___clear_le_bit(off, (void *)map->m_page_addrs[i]); + ext2_clear_bit(off, (void *)map->m_page_addrs[i]); } static int rds_cong_test_bit(struct rds_cong_map *map, __be16 port) @@ -310,7 +309,7 @@ static int rds_cong_test_bit(struct rds_cong_map *map, __be16 port) i = be16_to_cpu(port) / RDS_CONG_MAP_PAGE_BITS; off = be16_to_cpu(port) % RDS_CONG_MAP_PAGE_BITS; - return generic_test_le_bit(off, (void *)map->m_page_addrs[i]); + return ext2_test_bit(off, (void *)map->m_page_addrs[i]); } void rds_cong_add_socket(struct rds_sock *rs)