diff options
Diffstat (limited to 'sys/arch/hp300')
| -rw-r--r-- | sys/arch/hp300/hp300/locore.s | 13 | ||||
| -rw-r--r-- | sys/arch/hp300/hp300/machdep.c | 5 | ||||
| -rw-r--r-- | sys/arch/hp300/hp300/pmap_bootstrap.c | 5 |
3 files changed, 9 insertions, 14 deletions
diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s index 996212b349d..331931705cc 100644 --- a/sys/arch/hp300/hp300/locore.s +++ b/sys/arch/hp300/hp300/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.52 2006/01/21 12:27:56 miod Exp $ */ +/* $OpenBSD: locore.s,v 1.53 2006/05/19 22:51:07 miod Exp $ */ /* $NetBSD: locore.s,v 1.91 1998/11/11 06:41:25 thorpej Exp $ */ /* @@ -475,17 +475,14 @@ Lstart2: moveq #FC_USERD,d0 | user space movc d0,sfc | as source movc d0,dfc | and destination of transfers -/* initialize memory sizes (for pmap_bootstrap) */ +/* initialize memory size (for pmap_bootstrap) */ movl #MAXADDR,d1 | last page - moveq #PGSHIFT,d2 - lsrl d2,d1 | convert to page (click) number - RELOC(maxmem, a0) - movl d1,a0@ | save as maxmem movl a5,d0 | lowram value from ROM via boot - lsrl d2,d0 | convert to page number + moveq #PGSHIFT,d2 subl d0,d1 | compute amount of RAM present + lsrl d2,d1 | convert to pages RELOC(physmem, a0) - movl d1,a0@ | and physmem + movl d1,a0@ | save as physmem /* configure kernel and proc0 VA space so we can get going */ #if defined(DDB) || NKSYMS > 0 diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c index ef1619753d5..4499fa5db40 100644 --- a/sys/arch/hp300/hp300/machdep.c +++ b/sys/arch/hp300/hp300/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.107 2005/12/30 18:14:12 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.108 2006/05/19 22:51:07 miod Exp $ */ /* $NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $ */ /* @@ -120,8 +120,7 @@ int bufpages = 0; #endif int bufcachepercent = BUFCACHEPERCENT; -int maxmem; /* max memory per process */ -int physmem; /* max supported memory, changes to actual */ +int physmem; /* size of physical memory, in pages */ /* * safepri is a safe priority for sleep to set for a spin-wait * during autoconfiguration or after a panic. diff --git a/sys/arch/hp300/hp300/pmap_bootstrap.c b/sys/arch/hp300/hp300/pmap_bootstrap.c index 02b22567375..b0a63a57af1 100644 --- a/sys/arch/hp300/hp300/pmap_bootstrap.c +++ b/sys/arch/hp300/hp300/pmap_bootstrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_bootstrap.c,v 1.23 2005/10/28 09:07:48 martin Exp $ */ +/* $OpenBSD: pmap_bootstrap.c,v 1.24 2006/05/19 22:51:07 miod Exp $ */ /* $NetBSD: pmap_bootstrap.c,v 1.13 1997/06/10 18:56:50 veego Exp $ */ /* @@ -53,7 +53,6 @@ caddr_t ledbase; /* SPU LEDs mapping */ extern vaddr_t CLKbase, MMUbase; extern char *extiobase; -extern int maxmem; extern int eiomapsize; #define RELOC(v, t) *((t*)((u_int)&(v) + firstpa)) @@ -89,7 +88,7 @@ do { \ #define PMAP_MD_MEMSIZE() \ do { \ - RELOC(avail_end, paddr_t) = ptoa(RELOC(maxmem, int)) - \ + RELOC(avail_end, paddr_t) = MAXADDR - \ (round_page(MSGBUFSIZE) + ptoa(1)); \ } while (0) |