Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 052a0cf6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 9e6ec39b 87ba0051

arch/sparc/include/asm/vio.h

+0 −2
Original line number Diff line number Diff line
@@ -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)));

}