commit 3762825c0f00a3d524f32092ca16537b4d0dca87
author Stefan Roese <sr@denx.de> Wed Aug 06 14:05:38 2008 +0200
committer Stefan Roese <sr@denx.de> Wed Aug 06 14:05:38 2008 +0200
tree eec529fa883a32b0bd44f65aa46a454dc5c69688
parent ce5dcbfd9ab4794eb68d7a3f983054d45d06d46d

Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>

post/lib_ppc/b.c

diff --git a/post/lib_ppc/b.c b/post/lib_ppc/b.c
index 45b9ff2..7a2583d 100644
--- a/post/lib_ppc/b.c
+++ b/post/lib_ppc/b.c
@@ -95,6 +95,7 @@
 {
     int ret = 0;
     unsigned int i;
+    int flag = disable_interrupts();
 
     if (ret == 0)
     {
@@ -188,6 +189,9 @@
 	}
     }
 
+    if (flag)
+	enable_interrupts();
+
     return ret;
 }