diff options
author | Jon Mason <jdmason@us.ibm.com> | 2006-03-25 16:31:19 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 09:10:57 -0800 |
commit | c912c2db2f5c2467ba34e4e655008a14532a3900 (patch) | |
tree | b8fb312672424a20b3f2b6574a864f88a99d0605 /arch/x86_64 | |
parent | da7ed9f98f6f3f18664f8ab24303f9428b9d78f8 (diff) | |
download | op-kernel-dev-c912c2db2f5c2467ba34e4e655008a14532a3900.zip op-kernel-dev-c912c2db2f5c2467ba34e4e655008a14532a3900.tar.gz |
[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/x86_64')
-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 a0f955b..15b4558 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) printk("Cannot allocate aperture memory hole (%p,%uK)\n", p, aper_size>>10); if (p) - free_bootmem_node(nd0, (unsigned long)p, aper_size); + free_bootmem_node(nd0, __pa(p), aper_size); return 0; } printk("Mapping aperture over %d KB of RAM @ %lx\n", |