lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse Source 
* 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.
This commit is contained in:
Linus Torvalds
2009-09-26 10:08:23 -07:00
parent 9e6ec39bec 87ba005156
commit 052a0cf6f8
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/include/asm/vio.h
View File

@@ -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, static inline u32 vio_dring_avail(struct vio_dring_state *dr,
unsigned int ring_size) unsigned int ring_size)
{ {
MAYBE_BUILD_BUG_ON(!is_power_of_2(ring_size));
return (dr->pending - return (dr->pending -
((dr->prod - dr->cons) & (ring_size - 1))); ((dr->prod - dr->cons) & (ring_size - 1)));
} }