[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <873alz55pl.fsf@saeurebad.de>
Date: Thu, 24 Jul 2008 23:32:06 +0200
From: Johannes Weiner <hannes@...urebad.de>
To: David Miller <davem@...emloft.net>
Cc: akpm@...ux-foundation.org, sparclinux@...r.kernel.org,
bugme-daemon@...zilla.kernel.org, lomp0101@....net,
linux-kernel@...r.kernel.org
Subject: Re: [Bug 11046] New: Kernel bug in mm/bootmem.c on Sparc machines
Hi,
David Miller <davem@...emloft.net> writes:
> From: Andrew Morton <akpm@...ux-foundation.org>
> Date: Wed, 23 Jul 2008 20:38:36 -0700
>
>> So if we're going to change it in 2.6.26, we'll need a separate patch.
>
> Here is the 2.6.26 version:
>
> bootmem: Allow zero length reserve and free.
>
> It's either this or all the call sites explicitly check
> when such a case is possible and sometimes expected.
>
> Signed-off-by: David S. Miller <davem@...emloft.net>
>
> diff --git a/mm/bootmem.c b/mm/bootmem.c
> index 8d9f60e..e540f7a 100644
> --- a/mm/bootmem.c
> +++ b/mm/bootmem.c
> @@ -153,7 +153,8 @@ static void __init reserve_bootmem_core(bootmem_data_t *bdata,
> unsigned long sidx, eidx;
> unsigned long i;
>
> - BUG_ON(!size);
> + if (!size)
> + return;
>
> /* out of range */
> if (addr + size < bdata->node_boot_start ||
> @@ -187,7 +188,8 @@ static void __init free_bootmem_core(bootmem_data_t *bdata, unsigned long addr,
> unsigned long sidx, eidx;
> unsigned long i;
>
> - BUG_ON(!size);
> + if (!size)
> + return;
>
> /* out range */
> if (addr + size < bdata->node_boot_start ||
Sorry, Dave, I missed that before: there is still the BUG_ON() in
can_reserve_bootmem_core(), which should just return 0 instead.
Other than that, yes, Andrew, this introduces the same behaviour the
bootmem rewrite.
Hannes
--
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