2011-02-25 04:06:37

by Andres Salomon

Subject: [PATCH] x86: OLPC: have prom_early_alloc BUG rather than return NULL

..similar to what sparc's prom_early_alloc does.

Signed-off-by: Andres Salomon <[email protected]>
---
arch/x86/platform/olpc/olpc_dt.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
index dab8746..044bda5 100644
--- a/arch/x86/platform/olpc/olpc_dt.c
+++ b/arch/x86/platform/olpc/olpc_dt.c
@@ -140,8 +140,7 @@ void * __init prom_early_alloc(unsigned long size)
* wasted bootmem) and hand off chunks of it to callers.
*/
res = alloc_bootmem(chunk_size);
- if (!res)
- return NULL;
+ BUG_ON(!res);
prom_early_allocated += chunk_size;
memset(res, 0, chunk_size);
free_mem = chunk_size;
--
1.7.2.3

2011-02-25 06:20:31

by Grant Likely

Subject: Re: [PATCH] x86: OLPC: have prom_early_alloc BUG rather than return NULL

On Thu, Feb 24, 2011 at 9:06 PM, Andres Salomon <[email protected]> wrote:
>
> ..similar to what sparc's prom_early_alloc does.
>
> Signed-off-by: Andres Salomon <[email protected]>

What the hey, I've picked this up since it makes the other patch
simpler. I'll push the two patches to linux-next tomorrow and ask
Linus to pull in a few days.

g.

> ---
> ?arch/x86/platform/olpc/olpc_dt.c | ? ?3 +--
> ?1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
> index dab8746..044bda5 100644
> --- a/arch/x86/platform/olpc/olpc_dt.c
> +++ b/arch/x86/platform/olpc/olpc_dt.c
> @@ -140,8 +140,7 @@ void * __init prom_early_alloc(unsigned long size)
> ? ? ? ? ? ? ? ? * wasted bootmem) and hand off chunks of it to callers.
> ? ? ? ? ? ? ? ? */
> ? ? ? ? ? ? ? ?res = alloc_bootmem(chunk_size);
> - ? ? ? ? ? ? ? if (!res)
> - ? ? ? ? ? ? ? ? ? ? ? return NULL;
> + ? ? ? ? ? ? ? BUG_ON(!res);
> ? ? ? ? ? ? ? ?prom_early_allocated += chunk_size;
> ? ? ? ? ? ? ? ?memset(res, 0, chunk_size);
> ? ? ? ? ? ? ? ?free_mem = chunk_size;
> --
> 1.7.2.3
>
>



--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.