aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Rabson <dfr@FreeBSD.org>2000-10-25 23:36:01 +0000
committerDoug Rabson <dfr@FreeBSD.org>2000-10-25 23:36:01 +0000
commitd2041924cd63a7adec86f3d09a869dcd402e0d40 (patch)
treea3c9b6f8b4fc5e5058dc2650682d4b2c71f0a8da
parent75cdadceb410c4aa2f0759e726ee0717b4584131 (diff)
Notes
-rw-r--r--sys/boot/alpha/common/main.c5
-rw-r--r--sys/boot/alpha/libalpha/start.S4
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/boot/alpha/common/main.c b/sys/boot/alpha/common/main.c
index 778ce82ba44d..8b5fcffac181 100644
--- a/sys/boot/alpha/common/main.c
+++ b/sys/boot/alpha/common/main.c
@@ -66,8 +66,8 @@ memsize()
/* #define XTRA_PAGES 32 */
#define XTRA_PAGES 64
-static void
-extend_heap()
+void
+extend_heap(void)
{
struct rpb *hwrpb = (struct rpb *)HWRPB_ADDR;
struct mddt *mddtp;
@@ -119,7 +119,6 @@ main(void)
* alloc() is usable. The stack is buried inside us, so this is
* safe.
*/
- extend_heap();
setheap((void *)end, (void *)(0x20040000 + XTRA_PAGES * 8192));
#ifdef LOADER
diff --git a/sys/boot/alpha/libalpha/start.S b/sys/boot/alpha/libalpha/start.S
index 1830baf82e4a..6cf30a32aa5b 100644
--- a/sys/boot/alpha/libalpha/start.S
+++ b/sys/boot/alpha/libalpha/start.S
@@ -52,6 +52,10 @@ NESTED(start, 1, ENTRY_FRAME, ra, 0, 0)
Lstartgp:
LDGP(pv)
+#ifndef BOOT1
+ CALL(extend_heap)
+#endif
+
lda a0,_edata
lda a1,_end
subq a1,a0,a1