Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Merge commit. Changes below are compared with the first parent: 9e6ec39b.
Changes
1 files changed · +0 −2
| File | Status | Add | Del | Content |
|---|---|---|---|---|
| arch/sparc/include/asm/vio.h | modified | +0 | −2 | View file |
arch/sparc/include/asm/vio.h
View filediff --git a/arch/sparc/include/asm/vio.h b/arch/sparc/include/asm/vio.h
index 6cdbf7e..9d83d3b 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)));
}