From 60cd61622c30d0f8c6ac1121cf83d9fd8e480b53 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Sat, 25 Mar 2006 16:31:19 +0100 Subject: [PATCH] --- yaml --- r: 23836 b: refs/heads/master c: c912c2db2f5c2467ba34e4e655008a14532a3900 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/aperture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 17dbbb5074b5..e61e71d5070f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da7ed9f98f6f3f18664f8ab24303f9428b9d78f8 +refs/heads/master: c912c2db2f5c2467ba34e4e655008a14532a3900 diff --git a/trunk/arch/x86_64/kernel/aperture.c b/trunk/arch/x86_64/kernel/aperture.c index a0f955b9995f..15b45582101f 100644 --- a/trunk/arch/x86_64/kernel/aperture.c +++ b/trunk/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",