Re: linux-next: manual merge of the slab tree with the ftrace tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi all,

On Fri, 20 Feb 2009 16:57:28 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> @@@ -2723,18 -2689,9 +2727,19 @@@ static void *kmalloc_large_node(size_t 
>   void *__kmalloc_node(size_t size, gfp_t flags, int node)
>   {
>   	struct kmem_cache *s;
>  +	void *ret;
>   
>  -	if (unlikely(size > SLUB_MAX_SIZE))
>  -		return kmalloc_large_node(size, flags, node);
> ++	if (unlikely(size > SLUB_MAX_SIZE)) {
>  +	if (unlikely(size > PAGE_SIZE)) {

Except I screwed that up.  I meant to delete the last line above.  I will
add a patch to the end of linux-next for today.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp5HA5RUMAH5.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux