From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 23 Jun 2008 09:53:03 +0000 (+0200)
Subject: Merge branch 'linus' into x86/threadinfo
X-Git-Tag: v2.6.27-rc1~1106^2~251^21
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=009b9fc98ddd83f9139fdabb12c0d7a8535d5421;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into x86/threadinfo
---

009b9fc98ddd83f9139fdabb12c0d7a8535d5421
diff --cc include/asm-x86/page_32.h
index 50b33ebcf85,ccf0ba3c3ab..73ed2e4ebf9
--- a/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