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

Merge git://

* git://
  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
......@@ -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)
return (dr->pending -
((dr->prod - dr->cons) & (ring_size - 1)));
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment