diff options
| author | Jon Mason <jdmason@us.ibm.com> | 2006-03-25 10:31:19 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 12:10:57 -0500 |
| commit | c912c2db2f5c2467ba34e4e655008a14532a3900 (patch) | |
| tree | b8fb312672424a20b3f2b6574a864f88a99d0605 /arch | |
| parent | da7ed9f98f6f3f18664f8ab24303f9428b9d78f8 (diff) | |
[PATCH] x86_64: free_bootmem_node needs __pa in allocate_aperture
free_bootmem_node expects a physical address to be passed in, but
__alloc_bootmem_node returns a virtual one. That address needs to be
translated to physical.
Signed-off-by: Jon Mason <jdmason@us.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86_64/kernel/aperture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c index a0f955b9995f..15b45582101f 100644 --- a/arch/x86_64/kernel/aperture.c +++ b/arch/x86_64/kernel/aperture.c | |||
| @@ -60,7 +60,7 @@ static u32 __init allocate_aperture(void) | |||
| 60 | printk("Cannot allocate aperture memory hole (%p,%uK)\n", | 60 | printk("Cannot allocate aperture memory hole (%p,%uK)\n", |
| 61 | p, aper_size>>10); | 61 | p, aper_size>>10); |
| 62 | if (p) | 62 | if (p) |
| 63 | free_bootmem_node(nd0, (unsigned long)p, aper_size); | 63 | free_bootmem_node(nd0, __pa(p), aper_size); |
| 64 | return 0; | 64 | return 0; |
| 65 | } | 65 | } |
| 66 | printk("Mapping aperture over %d KB of RAM @ %lx\n", | 66 | printk("Mapping aperture over %d KB of RAM @ %lx\n", |