[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <AANLkTi=PpPKoHr1sOAwZZaFhVX9HOOqT7AYgY2QaX92O@mail.gmail.com>
Date: Thu, 24 Feb 2011 23:20:10 -0700
From: Grant Likely <grant.likely@...retlab.ca>
To: Andres Salomon <dilinger@...ued.net>
Cc: Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>,
"H. Peter Anvin" <hpa@...or.com>, x86@...nel.org,
linux-kernel@...r.kernel.org, devicetree-discuss@...ts.ozlabs.org
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 <dilinger@...ued.net> wrote:
>
> ..similar to what sparc's prom_early_alloc does.
>
> Signed-off-by: Andres Salomon <dilinger@...ued.net>
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists