vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
hollisb 2007-02-21 23:27:36 +00:00
parent 4785bfe460
commit 4a6cb94573
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
kern/powerpc/ieee1275/init.c
View file

@ -34,7 +34,7 @@
#include <grub/ieee1275/ofdisk.h> #include <grub/ieee1275/ofdisk.h>
#include <grub/ieee1275/ieee1275.h> #include <grub/ieee1275/ieee1275.h>
#define HEAP_SIZE (8<<20) /* 8 MiB */ #define HEAP_LIMIT (4<<20) /* 4 MiB */
extern char _start[]; extern char _start[];
extern char _end[]; extern char _end[];
@ -114,29 +114,27 @@ grub_machine_set_prefix (void)
} }
/* Claim some available memory in the first /memory node. */ /* Claim some available memory in the first /memory node. */
static void grub_claim_heap (unsigned long heapsize) static void grub_claim_heap (unsigned long heaplimit)
{ {
unsigned long total = 0;
auto int heap_init (grub_uint64_t addr, grub_uint64_t len); auto int heap_init (grub_uint64_t addr, grub_uint64_t len);
int heap_init (grub_uint64_t addr, grub_uint64_t len) int heap_init (grub_uint64_t addr, grub_uint64_t len)
{ {
len -= 1; /* Required for some firmware. */ len -= 1; /* Required for some firmware. */
/* Limit heap to `heapsize'. */ /* Don't claim anything above `heaplimit'. */
if (total + len > heapsize) if (addr + len > heaplimit)
len = heapsize - total; len = heaplimit - addr;
/* Claim and use it. */ if (len)
if (grub_claimmap (addr, len) < 0) {
return grub_error (GRUB_ERR_OUT_OF_MEMORY, /* Claim and use it. */
"Failed to claim heap at 0x%llx, len 0x%llx\n", if (grub_claimmap (addr, len) < 0)
addr, len); return grub_error (GRUB_ERR_OUT_OF_MEMORY,
grub_mm_init_region ((void *) (grub_addr_t) addr, len); "Failed to claim heap at 0x%llx, len 0x%llx\n",
addr, len);
grub_mm_init_region ((void *) (grub_addr_t) addr, len);
}
total += len;
if (total >= heapsize)
return 1;
return 0; return 0;
} }
@ -150,7 +148,7 @@ grub_machine_init (void)
int actual; int actual;
grub_console_init (); grub_console_init ();
grub_claim_heap (HEAP_SIZE); grub_claim_heap (HEAP_LIMIT);
grub_ofdisk_init (); grub_ofdisk_init ();
/* Process commandline. */ /* Process commandline. */