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/load.c

diff --git a/post/lib_ppc/load.c b/post/lib_ppc/load.c
index 86bc223..eccebb7 100644
--- a/post/lib_ppc/load.c
+++ b/post/lib_ppc/load.c
@@ -178,6 +178,7 @@
 {
     int ret = 0;
     unsigned int i;
+    int flag = disable_interrupts();
 
     for (i = 0; i < cpu_post_load_size && ret == 0; i++)
     {
@@ -246,6 +247,9 @@
 	}
     }
 
+    if (flag)
+	enable_interrupts();
+
     return ret;
 }