aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-26 10:08:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-26 10:08:23 -0700
commit052a0cf6f85a136dc0654ec3c2d25ddd4495c65d (patch)
treeaa2d34bd03947776f2da2481e101c0baea063c38
parent9e6ec39becb02bda776eebf12c0677910d54b848 (diff)
parent87ba00515657eede6077fa195ca6592b98cc31e3 (diff)
downloadlinux-linaro-052a0cf6f85a136dc0654ec3c2d25ddd4495c65d.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: vio: Kill BUILD_BUG_ON() in vio_dring_avail(). Trivial conflict in arch/sparc/include/asm/vio.h due to David removing the whole messy BUG_ON that was confused.
-rw-r--r--arch/sparc/include/asm/vio.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/vio.h b/arch/sparc/include/asm/vio.h
index 6cdbf7e7351..9d83d3bcb49 100644
--- a/arch/sparc/include/asm/vio.h
+++ b/arch/sparc/include/asm/vio.h
@@ -258,8 +258,6 @@ static inline void *vio_dring_entry(struct vio_dring_state *dr,
static inline u32 vio_dring_avail(struct vio_dring_state *dr,
unsigned int ring_size)
{
- MAYBE_BUILD_BUG_ON(!is_power_of_2(ring_size));
-
return (dr->pending -
((dr->prod - dr->cons) & (ring_size - 1)));
}