* [PATCH] x86: OLPC: have prom_early_alloc BUG rather than return NULL
@ 2011-02-25 4:06 Andres Salomon
2011-02-25 6:20 ` Grant Likely
0 siblings, 1 reply; 2+ messages in thread
From: Andres Salomon @ 2011-02-25 4:06 UTC (permalink / raw)
To: Thomas Gleixner
Cc: Ingo Molnar, H. Peter Anvin, x86, linux-kernel, Grant Likely,
devicetree-discuss
..similar to what sparc's prom_early_alloc does.
Signed-off-by: Andres Salomon <dilinger@queued.net>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] x86: OLPC: have prom_early_alloc BUG rather than return NULL
2011-02-25 4:06 [PATCH] x86: OLPC: have prom_early_alloc BUG rather than return NULL Andres Salomon
@ 2011-02-25 6:20 ` Grant Likely
0 siblings, 0 replies; 2+ messages in thread
From: Grant Likely @ 2011-02-25 6:20 UTC (permalink / raw)
To: Andres Salomon
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86, linux-kernel,
devicetree-discuss
On Thu, Feb 24, 2011 at 9:06 PM, Andres Salomon <dilinger@queued.net> wrote:
>
> ..similar to what sparc's prom_early_alloc does.
>
> Signed-off-by: Andres Salomon <dilinger@queued.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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-25 6:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-25 4:06 [PATCH] x86: OLPC: have prom_early_alloc BUG rather than return NULL Andres Salomon
2011-02-25 6:20 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox