diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 13:08:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 13:08:23 -0400 |
| commit | 052a0cf6f85a136dc0654ec3c2d25ddd4495c65d (patch) | |
| tree | aa2d34bd03947776f2da2481e101c0baea063c38 /arch | |
| parent | 9e6ec39becb02bda776eebf12c0677910d54b848 (diff) | |
| parent | 87ba00515657eede6077fa195ca6592b98cc31e3 (diff) | |
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.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/include/asm/vio.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/vio.h b/arch/sparc/include/asm/vio.h index 6cdbf7e7351d..9d83d3bcb494 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, | |||
| 258 | static inline u32 vio_dring_avail(struct vio_dring_state *dr, | 258 | static inline u32 vio_dring_avail(struct vio_dring_state *dr, |
| 259 | unsigned int ring_size) | 259 | unsigned int ring_size) |
| 260 | { | 260 | { |
| 261 | MAYBE_BUILD_BUG_ON(!is_power_of_2(ring_size)); | ||
| 262 | |||
| 263 | return (dr->pending - | 261 | return (dr->pending - |
| 264 | ((dr->prod - dr->cons) & (ring_size - 1))); | 262 | ((dr->prod - dr->cons) & (ring_size - 1))); |
| 265 | } | 263 | } |