diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 08:40:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 08:40:35 -0700 |
| commit | f9b3bcfbc43ac80f2019a5093ad9a1e624e611b1 (patch) | |
| tree | 9db502a626fca6213019bbff3e39ff37e11d853d /arch/x86/include | |
| parent | 01c7cd0ef5d98fdd007d8a04c9f834bead6e5ee1 (diff) | |
| parent | 13f72756da86f155898e2c2022f7b3a106c3742e (diff) | |
| download | linux-f9b3bcfbc43ac80f2019a5093ad9a1e624e611b1.tar.bz2 | |
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 smaller changes all over the map"
* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/iommu/dmar: Remove warning for HPET scope type
x86/mm/gart: Drop unnecessary check
x86/mm/hotplug: Put kernel_physical_mapping_remove() declaration in CONFIG_MEMORY_HOTREMOVE
x86/mm/fixmap: Remove unused FIX_CYCLONE_TIMER
x86/mm/numa: Simplify some bit mangling
x86/mm: Re-enable DEBUG_TLBFLUSH for X86_32
x86/mm/cpa: Cleanup split_large_page() and its callee
x86: Drop always empty .text..page_aligned section
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/fixmap.h | 3 | ||||
| -rw-r--r-- | arch/x86/include/asm/pgtable_types.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h index 51b9e322cb8f..0dc7d9e21c34 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h @@ -105,9 +105,6 @@ enum fixed_addresses { FIX_LI_PCIB, /* Lithium PCI Bridge B */ #endif FIX_RO_IDT, /* Virtual mapping for read-only IDT */ -#ifdef CONFIG_X86_CYCLONE_TIMER - FIX_CYCLONE_TIMER, /*cyclone timer register*/ -#endif #ifdef CONFIG_X86_32 FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h index 567b5d0632b2..e6423002c10b 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -351,7 +351,6 @@ static inline void update_page_count(int level, unsigned long pages) { } * as a pte too. */ extern pte_t *lookup_address(unsigned long address, unsigned int *level); -extern int __split_large_page(pte_t *kpte, unsigned long address, pte_t *pbase); extern phys_addr_t slow_virt_to_phys(void *__address); #endif /* !__ASSEMBLY__ */ |