* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, geode: add a VSA2 ID for General Software x86: use BOOTMEM_EXCLUSIVE on 32-bit x86, 32-bit: fix boot failure on TSC-less processors x86: fix NULL pointer deref in __switch_to x86: set PAE PHYSICAL_MASK_SHIFT to 44 bits.
Showing the changes to include (2 of 7 files). Show all
Unified · Split
| @@ -112,8 +112,8 @@ extern int geode_get_dev_base(unsigned int dev); · 111 unmodified lines | ||
| 112 | 112 | #define VSA_VR_UNLOCK 0xFC53 /* unlock virtual register */ |
| 113 | 113 | #define VSA_VR_SIGNATURE 0x0003 |
| 114 | 114 | #define VSA_VR_MEM_SIZE 0x0200 |
| 115 | −#define VSA_SIG 0x4132 /* signature is ascii 'VSA2' */ | |
| 116 | − | |
| 115 | +#define AMD_VSA_SIG 0x4132 /* signature is ascii 'VSA2' */ | |
| 116 | +#define GSW_VSA_SIG 0x534d /* General Software signature */ | |
| 117 | 117 | /* GPIO */ |
| 118 | 118 | |
| 119 | 119 | #define GPIO_OUTPUT_VAL 0x00 |
| @@ -14,7 +14,8 @@ · 13 unmodified lines | ||
| 14 | 14 | #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) |
| 15 | 15 | |
| 16 | 16 | #ifdef CONFIG_X86_PAE |
| 17 | −#define __PHYSICAL_MASK_SHIFT 36 | |
| 17 | +/* 44=32+12, the limit we can fit into an unsigned long pfn */ | |
| 18 | +#define __PHYSICAL_MASK_SHIFT 44 | |
| 18 | 19 | #define __VIRTUAL_MASK_SHIFT 32 |
| 19 | 20 | #define PAGETABLE_LEVELS 3 |
| 20 | 21 | |