From: Akinobu Mita <akinobu.mita@gmail.com>
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Akinobu Mita <akinobu.mita@gmail.com>,
Andy Grover <andy.grover@oracle.com>,
rds-devel@oss.oracle.com, "David S. Miller" <davem@davemloft.net>,
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 [thread overview]
Message-ID: <1286532193-29814-4-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1286532193-29814-1-git-send-email-akinobu.mita@gmail.com>
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 <akinobu.mita@gmail.com>
Cc: Andy Grover <andy.grover@oracle.com>
Cc: rds-devel@oss.oracle.com
Cc: "David S. Miller" <davem@davemloft.net>
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 <linux/slab.h>
#include <linux/types.h>
#include <linux/rbtree.h>
-
-#include <asm-generic/bitops/le.h>
+#include <linux/bitops.h>
#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)
--
1.7.1.231.gd0b16
next prev parent reply other threads:[~2010-10-08 10:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-08 10:03 [PATCH 1/5] bitops: add generic implementation of ext2 atomic bitops by test_and_{set,clear}_bit Akinobu Mita
2010-10-08 10:03 ` Akinobu Mita
2010-10-08 10:03 ` [PATCH 2/5] bitops: cleanup asm-generic/bitops/le.h Akinobu Mita
2010-10-08 10:03 ` Akinobu Mita
2010-10-08 10:03 ` [PATCH 3/5] kvm: stop including asm-generic/bitops/le.h directly Akinobu Mita
2010-10-08 10:03 ` Akinobu Mita
2010-10-08 12:45 ` Alexander Graf
2010-10-08 10:03 ` Akinobu Mita [this message]
2010-10-08 10:03 ` [PATCH 4/5] rds: " Akinobu Mita
2010-10-08 18:55 ` Andy Grover
2010-10-08 18:59 ` David Miller
2010-10-08 18:59 ` David Miller
2010-10-10 15:09 ` Akinobu Mita
2010-10-10 15:09 ` Akinobu Mita
2010-10-08 10:03 ` [PATCH 5/5] bitops: forbid asm-generic/bitops/le.h direct inclusion Akinobu Mita
2010-10-08 10:03 ` Akinobu Mita
2010-10-08 10:24 ` [PATCH 1/5] bitops: add generic implementation of ext2 atomic bitops by test_and_{set,clear}_bit Christoph Hellwig
2010-10-08 10:24 ` Christoph Hellwig
2010-10-10 15:07 ` Akinobu Mita
2010-10-10 16:36 ` Arnd Bergmann
2010-10-12 3:39 ` Akinobu Mita
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1286532193-29814-4-git-send-email-akinobu.mita@gmail.com \
--to=akinobu.mita@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andy.grover@oracle.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rds-devel@oss.oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).