Fix merge problems

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

diff --git a/post/lib_ppc/cmpi.c b/post/lib_ppc/cmpi.c
index 0afdd71..5ecfe87 100644 (file)
--- a/post/lib_ppc/cmpi.c
+++ b/post/lib_ppc/cmpi.c
@@ -102,11 +102,12 @@ int cpu_post_test_cmpi (void)
 {
     int ret = 0;
     unsigned int i;
+    int flag = disable_interrupts();
 
     for (i = 0; i < cpu_post_cmpi_size && ret == 0; i++)
     {
        struct cpu_post_cmpi_s *test = cpu_post_cmpi_table + i;
-       unsigned long code[] =
+       unsigned long code[] =
        {
            ASM_1IC(test->cmd, test->cr, 3, test->op2),
            ASM_MFCR(3),
@@ -124,6 +125,9 @@ int cpu_post_test_cmpi (void)
        }
     }
 
+    if (flag)
+       enable_interrupts();
+
     return ret;
 }