Message ID | 20090430064127.GF23746@wotan.suse.de (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
Nick Piggin wrote: > Hmm, forget that. Actually my last patch had a silly mistake because I > forgot MAX_ORDER shift is applied to PAGE_SIZE, rather than 1. So > kmalloc(PAGE_SIZE) was failing as too large. > > This patch should do the trick I hope. > Yes this patch fixed the issue for me. Thanks Nick. Regards -Sachin > Thanks, > Nick > --- > include/linux/slqb_def.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > Index: linux-2.6/include/linux/slqb_def.h > =================================================================== > --- linux-2.6.orig/include/linux/slqb_def.h > +++ linux-2.6/include/linux/slqb_def.h > @@ -172,7 +172,8 @@ struct kmem_cache { > #endif > > #define KMALLOC_SHIFT_LOW ilog2(KMALLOC_MIN_SIZE) > -#define KMALLOC_SHIFT_SLQB_HIGH (PAGE_SHIFT + 9) > +#define KMALLOC_SHIFT_SLQB_HIGH (PAGE_SHIFT + \ > + ((9 <= (MAX_ORDER - 1)) ? 9 : (MAX_ORDER - 1))) > > extern struct kmem_cache kmalloc_caches[KMALLOC_SHIFT_SLQB_HIGH + 1]; > extern struct kmem_cache kmalloc_caches_dma[KMALLOC_SHIFT_SLQB_HIGH + 1]; > -- > To unsubscribe from this list: send the line "unsubscribe linux-next" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > >
Index: linux-2.6/include/linux/slqb_def.h =================================================================== --- linux-2.6.orig/include/linux/slqb_def.h +++ linux-2.6/include/linux/slqb_def.h @@ -172,7 +172,8 @@ struct kmem_cache { #endif #define KMALLOC_SHIFT_LOW ilog2(KMALLOC_MIN_SIZE) -#define KMALLOC_SHIFT_SLQB_HIGH (PAGE_SHIFT + 9) +#define KMALLOC_SHIFT_SLQB_HIGH (PAGE_SHIFT + \ + ((9 <= (MAX_ORDER - 1)) ? 9 : (MAX_ORDER - 1))) extern struct kmem_cache kmalloc_caches[KMALLOC_SHIFT_SLQB_HIGH + 1]; extern struct kmem_cache kmalloc_caches_dma[KMALLOC_SHIFT_SLQB_HIGH + 1];