Fix merge problems

[platform/kernel/u-boot.git] / post / lib_ppc / complex.c

diff --git a/post/lib_ppc/complex.c b/post/lib_ppc/complex.c
index 271392a..4983c51 100644 (file)
--- a/post/lib_ppc/complex.c
+++ b/post/lib_ppc/complex.c
@@ -101,6 +101,7 @@ static int cpu_post_test_complex_2 (void)
 int cpu_post_test_complex (void)
 {
     int ret = 0;
+    int flag = disable_interrupts();
 
     if (ret == 0)
     {
@@ -117,6 +118,9 @@ int cpu_post_test_complex (void)
        post_log ("Error at complex test !\n");
     }
 
+    if (flag)
+       enable_interrupts();
+
     return ret;
 }