Re: mm snapshot broken-out-2007-11-20-01-45 Build Failure - macroCONFIG_THREAD_ORDER not defined

[Andrew Morton]

On Wed, 21 Nov 2007 02:48:38 +0530
Kamalesh Babulal <kamalesh@xxxxxxxxxxxxxxxxxx> wrote:

> Hi Andrew,
> 
> The kernel build fails, with randconfig
> 
>   CC      arch/x86/kernel/asm-offsets.s
> In file included from include/asm/thread_info.h:4,
>                  from include/linux/thread_info.h:21,
>                  from include/linux/preempt.h:9,
>                  from include/linux/spinlock.h:49,
>                  from include/linux/seqlock.h:29,
>                  from include/linux/time.h:8,
>                  from include/linux/stat.h:60,
>                  from include/linux/module.h:10,
>                  from include/linux/crypto.h:21,
>                  from arch/x86/kernel/asm-offsets_64.c:7,
>                  from arch/x86/kernel/asm-offsets.c:4:
> include/asm/thread_info_64.h: In function ___current_thread_info___:
> include/asm/thread_info_64.h:63: error: ___CONFIG_THREAD_ORDER___ undeclared (first use in this function)
> include/asm/thread_info_64.h:63: error: (Each undeclared identifier is reported only once
> include/asm/thread_info_64.h:63: error: for each function it appears in.)
> include/asm/thread_info_64.h: In function ___stack_thread_info___:
> include/asm/thread_info_64.h:71: error: ___CONFIG_THREAD_ORDER___ undeclared (first use in this function)
> In file included from arch/x86/kernel/asm-offsets_64.c:8,
>                  from arch/x86/kernel/asm-offsets.c:4:
> include/linux/sched.h: At top level:
> include/linux/sched.h:1527: error: ___CONFIG_THREAD_ORDER___ undeclared here (not in a function)
> make[1]: *** [arch/x86/kernel/asm-offsets.s] Error 1
> make: *** [prepare0] Error 2
> 
> The patch git-x86.patch introduces CONFIG_THREAD_ORDER undefined macro, instead of THREAD_ORDER.

hrm.  I suppose this will get us going:

diff -puN include/asm-x86/page_64.h~git-x86-thread_order-borkage include/asm-x86/page_64.h
--- a/include/asm-x86/page_64.h~git-x86-thread_order-borkage
+++ a/include/asm-x86/page_64.h
@@ -9,7 +9,7 @@
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 #define PHYSICAL_PAGE_MASK	(~(PAGE_SIZE-1) & __PHYSICAL_MASK)
 
-#define THREAD_SIZE  (PAGE_SIZE << CONFIG_THREAD_ORDER)
+#define THREAD_SIZE  (PAGE_SIZE << THREAD_ORDER)
 #define CURRENT_MASK (~(THREAD_SIZE-1))
 
 #define EXCEPTION_STACK_ORDER 0
diff -puN include/asm-x86/thread_info_64.h~git-x86-thread_order-borkage include/asm-x86/thread_info_64.h
--- a/include/asm-x86/thread_info_64.h~git-x86-thread_order-borkage
+++ a/include/asm-x86/thread_info_64.h
@@ -80,9 +80,9 @@ static inline struct thread_info *stack_
 #endif
 
 #define alloc_thread_info(tsk) \
-	((struct thread_info *) __get_free_pages(THREAD_FLAGS, CONFIG_THREAD_ORDER))
+	((struct thread_info *) __get_free_pages(THREAD_FLAGS, THREAD_ORDER))
 
-#define free_thread_info(ti) free_pages((unsigned long) (ti), CONFIG_THREAD_ORDER)
+#define free_thread_info(ti) free_pages((unsigned long) (ti), THREAD_ORDER)
 
 #else /* !__ASSEMBLY__ */
 
_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/