Commit:     b5637e65ee2cecd344b1f8ff750013f697d3ae16
Parent:     c596d9f320aaf30d28c1d793ff3a976dee1db8f5
Author:     Christoph Lameter <[EMAIL PROTECTED]>
AuthorDate: Sun May 6 14:49:33 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon May 7 12:12:53 2007 -0700

    i386: use page allocator to allocate thread_info structure
    i386 uses kmalloc to allocate the threadinfo structure assuming that the
    allocations result in a page sized aligned allocation.  That has worked so
    far because SLAB exempts page sized slabs from debugging and aligns them in
    special ways that goes beyond the restrictions imposed by
    KMALLOC_ARCH_MINALIGN valid for other slabs in the kmalloc array.
    SLUB also works fine without debugging since page sized allocations neatly
    align at page boundaries.  However, if debugging is switched on then SLUB
    will extend the slab with debug information.  The resulting slab is not
    longer of page size.  It will only be aligned following the requirements
    imposed by KMALLOC_ARCH_MINALIGN.  As a result the threadinfo structure may
    not be page aligned which makes i386 fail to boot with SLUB debug on.
    Replace the calls to kmalloc with calls into the page allocator.
    An alternate solution may be to create a custom slab cache where the
    alignment is set to PAGE_SIZE.  That would allow slub debugging to be
    applied to the threadinfo structure.
    Signed-off-by: Christoph Lameter <[EMAIL PROTECTED]>
    Cc: William Lee Irwin III <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 include/asm-i386/thread_info.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/asm-i386/thread_info.h b/include/asm-i386/thread_info.h
index 4b187bb..bf01d4b 100644
--- a/include/asm-i386/thread_info.h
+++ b/include/asm-i386/thread_info.h
@@ -95,12 +95,14 @@ static inline struct thread_info *current_thread_info(void)
 /* thread information allocation */
-#define alloc_thread_info(tsk) kzalloc(THREAD_SIZE, GFP_KERNEL)
+#define alloc_thread_info(tsk) ((struct thread_info *) \
+       __get_free_pages(GFP_KERNEL| __GFP_ZERO, get_order(THREAD_SIZE)))
-#define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL)
+#define alloc_thread_info(tsk) ((struct thread_info *) \
+       __get_free_pages(GFP_KERNEL, get_order(THREAD_SIZE)))
-#define free_thread_info(info) kfree(info)
+#define free_thread_info(info) free_pages((unsigned long)(info), 
 #else /* !__ASSEMBLY__ */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to