diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-23 02:55:47 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-23 02:55:47 -0500 |
| commit | ca9eed76133c00e7f4b1eeb4c1a6cb800cd2654c (patch) | |
| tree | 5f011f4bd00c921e41605b1915c227aeaf411a0d /arch/powerpc/boot/main.c | |
| parent | 8652cb4b0d87accbe78725fd2a13be2787059649 (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge commit 'v2.6.28-rc6' into x86/debug
Diffstat (limited to 'arch/powerpc/boot/main.c')
| -rw-r--r-- | arch/powerpc/boot/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c index ae32801ebd69..a28f02165e97 100644 --- a/arch/powerpc/boot/main.c +++ b/arch/powerpc/boot/main.c | |||
| @@ -63,7 +63,7 @@ static struct addr_range prep_kernel(void) | |||
| 63 | */ | 63 | */ |
| 64 | if ((unsigned long)_start < ei.loadsize) | 64 | if ((unsigned long)_start < ei.loadsize) |
| 65 | fatal("Insufficient memory for kernel at address 0!" | 65 | fatal("Insufficient memory for kernel at address 0!" |
| 66 | " (_start=%p, uncomressed size=%08x)\n\r", | 66 | " (_start=%p, uncompressed size=%08lx)\n\r", |
| 67 | _start, ei.loadsize); | 67 | _start, ei.loadsize); |
| 68 | 68 | ||
| 69 | if ((unsigned long)_end < ei.memsize) | 69 | if ((unsigned long)_end < ei.memsize) |