Merge branch 'linus' into x86/threadinfo

diff --cc include/asm-x86/page_32.h
index 50b33ebcf851f385dfa8bd9788cbb94371df2df4,ccf0ba3c3abac74f4329221876987df4b284ac95..73ed2e4ebf95189b3d89afe2137bb879b34eab39
--- 1/include/asm-x86/page_32.h
--- 2/include/asm-x86/page_32.h
+++ b/include/asm-x86/page_32.h
@@@ -13,16 -13,9 +13,17 @@@
   */
  #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)
 +
 +
  #ifdef CONFIG_X86_PAE
- #define __PHYSICAL_MASK_SHIFT 36
+ /* 44=32+12, the limit we can fit into an unsigned long pfn */
+ #define __PHYSICAL_MASK_SHIFT 44
  #define __VIRTUAL_MASK_SHIFT  32
  #define PAGETABLE_LEVELS      3