From: Paul Mackerras <paulus@samba.org>
Date: Thu, 8 Nov 2007 03:28:14 +0000 (+1100)
Subject: Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer... 
X-Git-Tag: v2.6.24-rc3~175^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=688016f4e2028e3c2c27e959ad001536e10ee2c5;p=~emulex%2Finfiniband.git

Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
---

688016f4e2028e3c2c27e959ad001536e10ee2c5
diff --cc arch/powerpc/boot/wrapper
index ece6f49638d,5ae48f474df..31147a03772
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@@ -281,25 -290,13 +289,15 @@@ ps3
  
      rm -f "$object/otheros.bld"
  
 +    ${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
 +
-     msg=$(dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
-         skip=$overlay_dest seek=$system_reset_kernel      \
-         count=$overlay_size bs=1 2>&1)
+     dd if="$ofile.bin" of="$ofile.bin" conv=notrunc   \
+         skip=$overlay_dest seek=$system_reset_kernel  \
+         count=$overlay_size bs=1
  
-     if [ $? -ne "0" ]; then
-        echo $msg
-        exit 1
-     fi
- 
-     msg=$(dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
-         skip=$system_reset_overlay seek=$overlay_dest     \
-         count=$overlay_size bs=1 2>&1)
- 
-     if [ $? -ne "0" ]; then
-        echo $msg
-        exit 2
-     fi
+     dd if="$ofile.bin" of="$ofile.bin" conv=notrunc   \
+         skip=$system_reset_overlay seek=$overlay_dest \
+         count=$overlay_size bs=1
  
      gzip --force -9 --stdout "$ofile.bin" > "$object/otheros.bld"
      ;;