Hi Linus,
On Dec 8, 2007 7:54 PM, Linus Torvalds <[EMAIL PROTECTED]> wrote:
> diff --git a/mm/slob.c b/mm/slob.c
> index ee2ef8a..773a7aa 100644
> --- a/mm/slob.c
> +++ b/mm/slob.c
> @@ -330,7 +330,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int
> align, int node)
>
> /* Not enough space: must allocate a new page */
> if (!b) {
> - b = slob_new_page(gfp, 0, node);
> + b = slob_new_page(gfp & ~__GFP_ZERO, 0, node);
> if (!b)
> return 0;
> sp = (struct slob_page *)virt_to_page(b);
>
> diff --git a/mm/slub.c b/mm/slub.c
> index b9f37cb..9c1d9f3 100644
> --- a/mm/slub.c
> +++ b/mm/slub.c
> @@ -1468,6 +1468,9 @@ static void *__slab_alloc(struct kmem_cache *s,
> void **object;
> struct page *new;
>
> + /* We handle __GFP_ZERO in the caller */
> + gfpflags &= ~__GFP_ZERO;
> +
> if (!c->page)
> goto new_slab;
In case you didn't already merge this:
Reviewed-by: Pekka Enberg <[EMAIL PROTECTED]>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
