From patchwork Sat Jan 22 13:13:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 80005 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 845AAB7102 for ; Sun, 23 Jan 2011 00:18:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753166Ab1AVNNh (ORCPT ); Sat, 22 Jan 2011 08:13:37 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:52422 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753124Ab1AVNN1 (ORCPT ); Sat, 22 Jan 2011 08:13:27 -0500 Received: by mail-iy0-f174.google.com with SMTP id 18so2561744iyj.19 for ; Sat, 22 Jan 2011 05:13:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=n+N0ojgPUwlaeIsq8J9gjerjHa/ynQNCdFeK5SJgKyc=; b=KfZEo0aMKTD8l85DtdjEZN271UYdvac2UNbgm33EdUQAccQQIqDj8pAIvYkut58y+c OdTdtU/8Ti0cLJal9IZOedkzgix8nrlVPybe1Zg9GwSSjBnv4TKAIB3ejC/quhkIhSHd thepSiNyqJIJ8312yUBi596Rccg04I1GfLLsQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=tpoJudmxXsLSi0ghdoL3TsqrjOsDivScqaA/fsEfXCNqPfodRqv9e6Bdxvby+2o3JG U7NYTaa0qqBKwfCw+ur1OOlQLsw2HXf+zwB4/OQtxYLDQlcBLKGW3Fl+5jg02o56RXNp FGtErkVh3b+rad81SvNqGG/nSNbYoLkaadanc= Received: by 10.42.226.72 with SMTP id iv8mr2193205icb.395.1295702006981; Sat, 22 Jan 2011 05:13:26 -0800 (PST) Received: from localhost.localdomain (p8025-adsao01yokonib2-acca.kanagawa.ocn.ne.jp [219.161.30.25]) by mx.google.com with ESMTPS id i2sm7956638icv.3.2011.01.22.05.13.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 22 Jan 2011 05:13:26 -0800 (PST) From: Akinobu Mita To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, akpm@linux-foundation.org Cc: Akinobu Mita , Andy Grover , rds-devel@oss.oracle.com, "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH v5 02/27] rds: stop including asm-generic/bitops/le.h directly Date: Sat, 22 Jan 2011 22:13:34 +0900 Message-Id: <1295702039-23186-3-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1295702039-23186-1-git-send-email-akinobu.mita@gmail.com> References: <1295702039-23186-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. It seems odd to use ext2_*_bit() on rds, but it will replaced with __{set,clear,test}_bit_le() after introducing little endian bit operations for all architectures. This indirect step is necessary to maintain bisectability for some architectures which have their own little-endian bit operations. Signed-off-by: Akinobu Mita Cc: Andy Grover Cc: rds-devel@oss.oracle.com Cc: "David S. Miller" Cc: netdev@vger.kernel.org --- Change from v4: - splitted into two patches to fix a bisection hole The whole series is available in the git branch at: git://git.kernel.org/pub/scm/linux/kernel/git/mita/linux-2.6.git le-bitops-v5 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 75ea686..8cc322b 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)