| commit | 3762825c0f00a3d524f32092ca16537b4d0dca87 | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] |
Fix merge problems Signed-off-by: Stefan Roese <sr@denx.de>
diff --git a/post/lib_ppc/string.c b/post/lib_ppc/string.c index b2daa88..3683ac9 100644 --- a/post/lib_ppc/string.c +++ b/post/lib_ppc/string.c
@@ -47,6 +47,7 @@ { int ret = 0; unsigned int i; + int flag = disable_interrupts(); if (ret == 0) { @@ -97,6 +98,9 @@ post_log ("Error at string test !\n"); } + if (flag) + enable_interrupts(); + return ret; }