---

yaml --- r: 166370 b: refs/heads/master c: a72bfd4 h: refs/heads/master v: v3
git-mirror · Sep 25, 2009 · 9d42259 · 9d42259
1 parent cf629ac
commit 9d42259
Show file tree

Hide file tree

Showing 21 changed files with 420 additions and 1,465 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07e2e6ba2761291aa182993ebba1f490b5005dcc
+refs/heads/master: a72bfd4dea053bb8e2233902c3f1893ef5485802
diff --git a/trunk/arch/arm/kernel/entry-header.S b/trunk/arch/arm/kernel/entry-header.S
@@ -83,8 +83,6 @@
 	ldr	r0, [sp]
 	strex	r1, r2, [sp]			@ clear the exclusive monitor
 	ldmib	sp, {r1 - pc}^			@ load r1 - pc, cpsr
-#else
-	ldmia	sp, {r0 - pc}^			@ load r0 - pc, cpsr
 #endif
 	.endm
 

diff --git a/trunk/arch/sparc/include/asm/vio.h b/trunk/arch/sparc/include/asm/vio.h
@@ -258,6 +258,8 @@ 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)));
 }