summaryrefslogtreecommitdiffstats
path: root/sys/arm
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2008-04-03 06:14:23 +0000
committerimp <imp@FreeBSD.org>2008-04-03 06:14:23 +0000
commit24b0dea1b185e83c2e9bf4347228ed8c0fc7928e (patch)
tree88b4194bad31d9d42413414b459dbdfa38a65b6a /sys/arm
parent01156d94e4f5f7496dbb43ff70615afcfec6d1e2 (diff)
downloadFreeBSD-src-24b0dea1b185e83c2e9bf4347228ed8c0fc7928e.zip
FreeBSD-src-24b0dea1b185e83c2e9bf4347228ed8c0fc7928e.tar.gz
KERNBASE + 0x00200000 is the same thing as KERNVIRTADDR on this
platform, so use the latter in preference to the former. This makes the fake_preload setup be the same between kb920x_machdep.c and avila_machdep.c....
Diffstat (limited to 'sys/arm')
-rw-r--r--sys/arm/xscale/ixp425/avila_machdep.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arm/xscale/ixp425/avila_machdep.c b/sys/arm/xscale/ixp425/avila_machdep.c
index 71d7f71..1581c36 100644
--- a/sys/arm/xscale/ixp425/avila_machdep.c
+++ b/sys/arm/xscale/ixp425/avila_machdep.c
@@ -288,10 +288,10 @@ initarm(void *arg, void *arg2)
i += 2;
fake_preload[i++] = MODINFO_ADDR;
fake_preload[i++] = sizeof(vm_offset_t);
- fake_preload[i++] = KERNBASE + 0x00200000;
+ fake_preload[i++] = KERNVIRTADDR;
fake_preload[i++] = MODINFO_SIZE;
fake_preload[i++] = sizeof(uint32_t);
- fake_preload[i++] = (uint32_t)&end - KERNBASE - 0x00200000;
+ fake_preload[i++] = (uint32_t)&end - KERNVIRTADDR;
#ifdef DDB
if (*(uint32_t *)KERNVIRTADDR == MAGIC_TRAMP_NUMBER) {
fake_preload[i++] = MODINFO_METADATA|MODINFOMD_SSYM;
@@ -317,7 +317,6 @@ initarm(void *arg, void *arg2)
pcpu_init(pcpup, 0, sizeof(struct pcpu));
PCPU_SET(curthread, &thread0);
-#define KERNEL_TEXT_BASE (KERNBASE + 0x00200000)
freemempos = 0x10200000;
/* Define a macro to simplify memory allocation */
#define valloc_pages(var, np) \
OpenPOWER on IntegriCloud