diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-09-11 01:31:48 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 17:24:26 +0200 |
| commit | 947d0496cf3e12ebfa70b3eaf561c25403247ce9 (patch) | |
| tree | f2f77730b77c50735669dca5ff42afee69463d0e /arch | |
| parent | 600715dcdf567c86f8b2c6173fcfb4b873e25a19 (diff) | |
| download | kernel_samsung_crespo-947d0496cf3e12ebfa70b3eaf561c25403247ce9.zip kernel_samsung_crespo-947d0496cf3e12ebfa70b3eaf561c25403247ce9.tar.gz kernel_samsung_crespo-947d0496cf3e12ebfa70b3eaf561c25403247ce9.tar.bz2 | |
generic: make PFN_PHYS explicitly return phys_addr_t
PFN_PHYS, as its name suggests, turns a pfn into a physical address.
However, it is a macro which just operates on its argument without
modifying its type. pfns are typed unsigned long, but an unsigned
long may not be long enough to hold a physical address (32-bit systems
with more than 32 bits of physcial address).
Make sure we cast to phys_addr_t to return a complete result.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m32r/mm/discontig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c index cbc3c4c..7daf897 100644 --- a/arch/m32r/mm/discontig.c +++ b/arch/m32r/mm/discontig.c @@ -111,9 +111,9 @@ unsigned long __init setup_memory(void) initrd_start, INITRD_SIZE); } else { printk("initrd extends beyond end of memory " - "(0x%08lx > 0x%08lx)\ndisabling initrd\n", + "(0x%08lx > 0x%08llx)\ndisabling initrd\n", INITRD_START + INITRD_SIZE, - PFN_PHYS(max_low_pfn)); + (unsigned long long)PFN_PHYS(max_low_pfn)); initrd_start = 0; } |