summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2002-08-04 18:11:38 +0000
committerpeter <peter@FreeBSD.org>2002-08-04 18:11:38 +0000
commitb1ae8f9d32a24d98e8389b0a78c5b00dd3a6ef67 (patch)
treef36eb353ee3668cb0add1b05646b466bfdf3d717 /sys
parenta3625aac031389fa391fcf5d991fc8cfc33f2fcc (diff)
downloadFreeBSD-src-b1ae8f9d32a24d98e8389b0a78c5b00dd3a6ef67.zip
FreeBSD-src-b1ae8f9d32a24d98e8389b0a78c5b00dd3a6ef67.tar.gz
Fix a mistake in 1.352 - I was returning a pointer to the rounded down
address. I expect this will fix acpica.
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/amd64/pmap.c2
-rw-r--r--sys/i386/i386/pmap.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index baa9e86..208fdab 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -3284,7 +3284,7 @@ pmap_mapdev(pa, size)
/* We have a 1MB direct mapped region at KERNBASE */
if (pa < 0x00100000 && pa + size <= 0x00100000)
- return (void *)(pa + KERNBASE);
+ return (void *)(pa + offset + KERNBASE);
GIANT_REQUIRED;
va = kmem_alloc_pageable(kernel_map, size);
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index baa9e86..208fdab 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -3284,7 +3284,7 @@ pmap_mapdev(pa, size)
/* We have a 1MB direct mapped region at KERNBASE */
if (pa < 0x00100000 && pa + size <= 0x00100000)
- return (void *)(pa + KERNBASE);
+ return (void *)(pa + offset + KERNBASE);
GIANT_REQUIRED;
va = kmem_alloc_pageable(kernel_map, size);
OpenPOWER on IntegriCloud