manual merge of x86/mm

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/include/asm/fixmap.h
index 51b9e322cb8f1b4ceb90cdeb92b47b2f708c2bee,83ea2fb5fc75e08d73bac8e5c6c43c83d256a2eb..0dc7d9e21c34f2d8e8284c7f9a76b78c19eef2e9
--- 1/arch/x86/include/asm/fixmap.h
--- 2/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,

diff --cc arch/x86/mm/pageattr.c
Simple merge