Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

[mv-sheeva.git] / arch / x86 / include / asm / page_32_types.h

diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
index 6f1b7331313f1af2744c50accfecd26e069a5bed..ade619ff9e2a414c918c7ba3c38352ee72a79254 100644 (file)
--- a/arch/x86/include/asm/page_32_types.h
+++ b/arch/x86/include/asm/page_32_types.h
@@ -15,11 +15,7 @@
  */
 #define __PAGE_OFFSET          _AC(CONFIG_PAGE_OFFSET, UL)
 
-#ifdef CONFIG_4KSTACKS
-#define THREAD_ORDER   0
-#else
 #define THREAD_ORDER   1
-#endif
 #define THREAD_SIZE    (PAGE_SIZE << THREAD_ORDER)
 
 #define STACKFAULT_STACK 0