diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 12:36:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 12:36:38 -0700 |
| commit | b1ae8d3a00530c035ef97fa4d97f4bee9be75c43 (patch) | |
| tree | 6d98f8048b68643803c6a70fba503c18126bd8d1 /include | |
| parent | 55017923f699471f68c1469d5f3ff141dd416ab4 (diff) | |
| parent | ffe6e1da86d21d7855495b5a772c93f050258f6e (diff) | |
| download | kernel_samsung_smdk4412-b1ae8d3a00530c035ef97fa4d97f4bee9be75c43.zip kernel_samsung_smdk4412-b1ae8d3a00530c035ef97fa4d97f4bee9be75c43.tar.gz kernel_samsung_smdk4412-b1ae8d3a00530c035ef97fa4d97f4bee9be75c43.tar.bz2 | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* '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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/geode.h | 4 | ||||
| -rw-r--r-- | include/asm-x86/page_32.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-x86/geode.h b/include/asm-x86/geode.h index 6e64588..bb06027 100644 --- a/include/asm-x86/geode.h +++ b/include/asm-x86/geode.h @@ -112,8 +112,8 @@ extern int geode_get_dev_base(unsigned int dev); #define VSA_VR_UNLOCK 0xFC53 /* unlock virtual register */ #define VSA_VR_SIGNATURE 0x0003 #define VSA_VR_MEM_SIZE 0x0200 -#define VSA_SIG 0x4132 /* signature is ascii 'VSA2' */ - +#define AMD_VSA_SIG 0x4132 /* signature is ascii 'VSA2' */ +#define GSW_VSA_SIG 0x534d /* General Software signature */ /* GPIO */ #define GPIO_OUTPUT_VAL 0x00 diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h index 424e82f..ccf0ba3 100644 --- a/include/asm-x86/page_32.h +++ b/include/asm-x86/page_32.h @@ -14,7 +14,8 @@ #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) #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 |