summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2010-04-13 13:16:02 -0500
committerWolfgang Denk <wd@denx.de>2010-05-05 22:17:07 +0200
commit52dbac69c27dee67a4c051b1055d93b0ac4e2062 (patch)
tree75bda2e7098b5180c9b11470701269fa37722bef
parentb88c5988db176a0f9de5598d5167ee2498637d40 (diff)
downloadtalos-obmc-uboot-52dbac69c27dee67a4c051b1055d93b0ac4e2062.tar.gz
talos-obmc-uboot-52dbac69c27dee67a4c051b1055d93b0ac4e2062.zip
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 <timur@freescale.com>
-rw-r--r--lib/display_options.c4
1 files changed, 2 insertions, 2 deletions
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 */
OpenPOWER on IntegriCloud