From: Anton Blanchard <anton@samba.org>
Date: Thu, 8 Jul 2010 19:03:33 +0000 (+0000)
Subject: Use prom_claim_chunk to allocate malloc area
X-Git-Tag: yaboot-1.3.17-rc1~14
X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=commitdiff_plain;h=2c611ced5c7fa551d47da32e574bc7f2ff2df18b

Use prom_claim_chunk to allocate malloc area

prom_claim_chunk does the same thing as this loop, so we can
use it instead.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
---

diff --git a/second/yaboot.c b/second/yaboot.c
index 5c8c8ea..765c7bf 100644
--- a/second/yaboot.c
+++ b/second/yaboot.c
@@ -177,7 +177,6 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5)
 {
      int result;
      void* malloc_base = NULL;
-     unsigned long addr;
      prom_handle root;
 
      /* OF seems to do it, but I'm not very confident */
@@ -187,10 +186,7 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5)
      prom_init ((prom_entry) r5);
 
      /* Allocate some memory for malloc'ator */
-     for (addr = MALLOCADDR; addr <= MALLOCADDR * 16 ;addr+=0x100000) {
-	  malloc_base = prom_claim((void *)addr, MALLOCSIZE, 0);
-	  if (malloc_base != (void *)-1) break;
-     }
+     malloc_base = prom_claim_chunk((void *)MALLOCADDR, MALLOCSIZE, 0);
      if (malloc_base == (void *)-1) {
 	  prom_printf("Can't claim malloc buffer (%d bytes at 0x%08x)\n",
 		      MALLOCSIZE, MALLOCADDR);