Fix merge problems

[karo-tx-uboot.git] / post / lib_ppc / multi.c

diff --git a/post/lib_ppc/multi.c b/post/lib_ppc/multi.c
index 5d3f5842811e6d72c8562ff0b1f2180ddb6cb02a..47135abd4ca431b28d7b82b551109f60200ff7d5 100644 (file)
--- a/post/lib_ppc/multi.c
+++ b/post/lib_ppc/multi.c
@@ -44,6 +44,7 @@ int cpu_post_test_multi (void)
 {
     int ret = 0;
     unsigned int i;
+    int flag = disable_interrupts();
 
     if (ret == 0)
     {
@@ -72,6 +73,9 @@ int cpu_post_test_multi (void)
        post_log ("Error at multi test !\n");
     }
 
+    if (flag)
+       enable_interrupts();
+
     return ret;
 }