[PATCH] "drivers/mtd/redboot.c: recognise a foreign byte sex partition table" update

Sync up the recent redboot fix with MTD CVS. It uses the correct swab()
functions.

Cc: John Bowler <jbowler@acm.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by John Bowler and committed by Linus Torvalds 77a33135 140ffcec

+10 -12
+10 -12
drivers/mtd/redboot.c
··· 1 1 /* 2 - * $Id: redboot.c,v 1.18 2005/11/07 11:14:21 gleixner Exp $ 2 + * $Id: redboot.c,v 1.19 2005/12/01 10:03:51 dwmw2 Exp $ 3 3 * 4 4 * Parse RedBoot-style Flash Image System (FIS) tables and 5 5 * produce a Linux partition array to match. ··· 92 92 if (!memcmp(buf[i].name, "FIS directory", 14)) { 93 93 /* This is apparently the FIS directory entry for the 94 94 * FIS directory itself. The FIS directory size is 95 - * one erase block, if the buf[i].size field is 95 + * one erase block; if the buf[i].size field is 96 96 * swab32(erasesize) then we know we are looking at 97 97 * a byte swapped FIS directory - swap all the entries! 98 - * (NOTE: this is 'size' not 'data_length', size is 98 + * (NOTE: this is 'size' not 'data_length'; size is 99 99 * the full size of the entry.) 100 100 */ 101 101 if (swab32(buf[i].size) == master->erasesize) { ··· 104 104 /* The unsigned long fields were written with the 105 105 * wrong byte sex, name and pad have no byte sex. 106 106 */ 107 - # define do_swab32(x) (x) = swab32(x) 108 - do_swab32(buf[j].flash_base); 109 - do_swab32(buf[j].mem_base); 110 - do_swab32(buf[j].size); 111 - do_swab32(buf[j].entry_point); 112 - do_swab32(buf[j].data_length); 113 - do_swab32(buf[j].desc_cksum); 114 - do_swab32(buf[j].file_cksum); 115 - # undef do_swab32 107 + swab32s(&buf[j].flash_base); 108 + swab32s(&buf[j].mem_base); 109 + swab32s(&buf[j].size); 110 + swab32s(&buf[j].entry_point); 111 + swab32s(&buf[j].data_length); 112 + swab32s(&buf[j].desc_cksum); 113 + swab32s(&buf[j].file_cksum); 116 114 } 117 115 } 118 116 break;