Fix merge problems

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

1 files changed, 4 insertions, 0 deletions

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