---

yaml --- r: 166371 b: refs/heads/master c: bfebb14 h: refs/heads/master i: 166369: cf629ac 166367: 0f72d85 v: v3
git-mirror · Sep 26, 2009 · c892630 · c892630
1 parent 9d42259
commit c892630
Show file tree

Hide file tree

Showing 18 changed files with 1,461 additions and 413 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a72bfd4dea053bb8e2233902c3f1893ef5485802
+refs/heads/master: bfebb1406329667f2cccb50fad1de87f573b2c1a
diff --git a/trunk/arch/arm/kernel/entry-header.S b/trunk/arch/arm/kernel/entry-header.S
@@ -83,6 +83,8 @@
 	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,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)));
 }