From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Apr 2013 15:40:35 +0000 (-0700)
Subject: Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.10-rc1~165
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=f9b3bcfbc43ac80f2019a5093ad9a1e624e611b1;p=karo-tx-linux.git

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
---

f9b3bcfbc43ac80f2019a5093ad9a1e624e611b1
diff --cc arch/x86/include/asm/fixmap.h
index 51b9e322cb8f,83ea2fb5fc75..0dc7d9e21c34
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@@ -104,10 -104,9 +104,7 @@@ enum fixed_addresses 
  	FIX_LI_PCIA,	/* Lithium PCI Bridge A */
  	FIX_LI_PCIB,	/* Lithium PCI Bridge B */
  #endif
 -#ifdef CONFIG_X86_F00F_BUG
 -	FIX_F00F_IDT,	/* Virtual mapping for IDT */
 -#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,