diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 16:29:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 16:29:05 -0700 |
| commit | 1982269a5c51c70cddceb8d157f07b522aee0a2d (patch) | |
| tree | cfa5d233a527b15324f6d2756d8fe275aa17f5d1 /arch/x86/include | |
| parent | fdd78889aad2ec85b2f5a8ed232215dca7a22a3b (diff) | |
| parent | 4f4319a02a6108be3e65b9d44d1b7f5e8f520535 (diff) | |
| download | op-kernel-dev-1982269a5c51c70cddceb8d157f07b522aee0a2d.zip op-kernel-dev-1982269a5c51c70cddceb8d157f07b522aee0a2d.tar.gz | |
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 mm changes from Ingo Molnar:
"Misc improvements:
- Fix /proc/mtrr reporting
- Fix ioremap printout
- Remove the unused pvclock fixmap entry on 32-bit
- misc cleanups"
* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/ioremap: Correct function name output
x86: Fix /proc/mtrr with base/size more than 44bits
ix86: Don't waste fixmap entries
x86/mm: Drop unneeded include <asm/*pgtable, page*_types.h>
x86_64: Correct phys_addr in cleanup_highmap comment
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/fixmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h index 0dc7d9e..e846225 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h @@ -81,11 +81,11 @@ enum fixed_addresses { + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1, VVAR_PAGE, VSYSCALL_HPET, -#endif #ifdef CONFIG_PARAVIRT_CLOCK PVCLOCK_FIXMAP_BEGIN, PVCLOCK_FIXMAP_END = PVCLOCK_FIXMAP_BEGIN+PVCLOCK_VSYSCALL_NR_PAGES-1, #endif +#endif FIX_DBGP_BASE, FIX_EARLYCON_MEM_BASE, #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT |
