From: Timur Tabi Date: Tue, 13 Apr 2010 18:16:02 +0000 (-0500) Subject: fix print_size printing fractional gigabyte numbers on 32-bit platforms X-Git-Tag: v2010.06-rc1~65 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=52dbac69c27dee67a4c051b1055d93b0ac4e2062;p=u-boot fix print_size printing fractional gigabyte numbers on 32-bit platforms In print_size(), the math that calculates the fractional remainder of a number used the same integer size as a physical address. However, the "10 *" factor of the algorithm means that a large number (e.g. 1.5GB) can overflow the integer if we're running on a 32-bit system. Therefore, we need to disassociate this function from the size of a physical address. Signed-off-by: Timur Tabi --- diff --git a/lib/display_options.c b/lib/display_options.c index 2dc2567410..08a7914a1d 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -45,8 +45,8 @@ int display_options (void) */ void print_size (phys_size_t size, const char *s) { - ulong m = 0, n; - phys_size_t d = 1 << 30; /* 1 GB */ + unsigned long m = 0, n; + unsigned long long d = 1 << 30; /* 1 GB */ char c = 'G'; if (size < d) { /* try MB */