Merge branches 'x86/asm', 'x86/cleanups', 'x86/cpudetect', 'x86/debug', 'x86/doc...

diff --cc arch/x86/include/asm/io.h
Simple merge

diff --cc arch/x86/include/asm/paravirt.h
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/include/asm/setup.h
Simple merge

diff --cc arch/x86/include/asm/spinlock.h
index d17c919,4d3dcc5,2bd6b11,d17c919,d17c919,d17c919,d17c919,d17c919,d17c919,d17c919,d17c919,d17c919,2bd6b11,d17c919..139b424
--- 1/arch/x86/include/asm/spinlock.h
--- 2/arch/x86/include/asm/spinlock.h
--- 3/arch/x86/include/asm/spinlock.h
--- 4/arch/x86/include/asm/spinlock.h
--- 5/arch/x86/include/asm/spinlock.h
--- 6/arch/x86/include/asm/spinlock.h
--- 7/arch/x86/include/asm/spinlock.h
--- 8/arch/x86/include/asm/spinlock.h
--- 9/arch/x86/include/asm/spinlock.h
--- 10/arch/x86/include/asm/spinlock.h
--- 11/arch/x86/include/asm/spinlock.h
--- 12/arch/x86/include/asm/spinlock.h
--- 13/arch/x86/include/asm/spinlock.h
--- 14/arch/x86/include/asm/spinlock.h
+++ b/arch/x86/include/asm/spinlock.h
@@@@@@@@@@@@@@@ -172,70 -172,70 -172,8 -172,70 -172,70 -172,70 -172,70 -172,70 -172,70 -172,70 -172,70 -172,70 -172,8 -172,70 +172,8 @@@@@@@@@@@@@@@ static inline int __ticket_spin_is_cont
                return (((tmp >> TICKET_SHIFT) - tmp) & ((1 << TICKET_SHIFT) - 1)) > 1;
              }
              
-- --------- -#ifdef CONFIG_PARAVIRT
-- --------- -/*
-- --------- - * Define virtualization-friendly old-style lock byte lock, for use in
-- --------- - * pv_lock_ops if desired.
-- --------- - *
-- --------- - * This differs from the pre-2.6.24 spinlock by always using xchgb
-- --------- - * rather than decb to take the lock; this allows it to use a
-- --------- - * zero-initialized lock structure.  It also maintains a 1-byte
-- --------- - * contention counter, so that we can implement
-- --------- - * __byte_spin_is_contended.
-- --------- - */
-- --------- -struct __byte_spinlock {
-- --------- -  s8 lock;
-- --------- -  s8 spinners;
-- --------- -};
-- --------- -
-- --------- -static inline int __byte_spin_is_locked(raw_spinlock_t *lock)
-- --------- -{
-- --------- -  struct __byte_spinlock *bl = (struct __byte_spinlock *)lock;
-- --------- -  return bl->lock != 0;
-- --------- -}
-- --------- -
-- --------- -static inline int __byte_spin_is_contended(raw_spinlock_t *lock)
-- --------- -{
-- --------- -  struct __byte_spinlock *bl = (struct __byte_spinlock *)lock;
-- --------- -  return bl->spinners != 0;
-- --------- -}
-- --------- -
-- --------- -static inline void __byte_spin_lock(raw_spinlock_t *lock)
-- --------- -{
-- --------- -  struct __byte_spinlock *bl = (struct __byte_spinlock *)lock;
-- --------- -  s8 val = 1;
-  --------- -
-  --------- -  asm("1: xchgb %1, %0\n"
-  --------- -      "   test %1,%1\n"
-  --------- -      "   jz 3f\n"
-  --------- -      "   " LOCK_PREFIX "incb %2\n"
-  --------- -      "2: rep;nop\n"
-  --------- -      "   cmpb $1, %0\n"
-  --------- -      "   je 2b\n"
-  --------- -      "   " LOCK_PREFIX "decb %2\n"
-  --------- -      "   jmp 1b\n"
-  --------- -      "3:"
-  --------- -      : "+m" (bl->lock), "+q" (val), "+m" (bl->spinners): : "memory");
-  --------- -}
-  --------- -
-  --------- -static inline int __byte_spin_trylock(raw_spinlock_t *lock)
-  --------- -{
-  --------- -  struct __byte_spinlock *bl = (struct __byte_spinlock *)lock;
-  --------- -  u8 old = 1;
-  --------- -
-  --------- -  asm("xchgb %1,%0"
-  --------- -      : "+m" (bl->lock), "+q" (old) : : "memory");
++ +++++++++ +#ifndef CONFIG_PARAVIRT
              
 -              asm("1: xchgb %1, %0\n"
 -                  "   test %1,%1\n"
 -                  "   jz 3f\n"
 -                  "   " LOCK_PREFIX "incb %2\n"
 -                  "2: rep;nop\n"
 -                  "   cmpb $1, %0\n"
 -                  "   je 2b\n"
 -                  "   " LOCK_PREFIX "decb %2\n"
 -                  "   jmp 1b\n"
 -                  "3:"
 -                  : "+m" (bl->lock), "+q" (val), "+m" (bl->spinners): : "memory");
 -            }
 -            
 -            static inline int __byte_spin_trylock(raw_spinlock_t *lock)
 -            {
 -              struct __byte_spinlock *bl = (struct __byte_spinlock *)lock;
 -              u8 old = 1;
 -            
 -              asm("xchgb %1,%0"
 -                  : "+m" (bl->lock), "+q" (old) : : "memory");
 -            
-- --------- -  return old == 0;
-- --------- -}
-- --------- -
-- --------- -static inline void __byte_spin_unlock(raw_spinlock_t *lock)
-- --------- -{
-- --------- -  struct __byte_spinlock *bl = (struct __byte_spinlock *)lock;
-- --------- -  smp_wmb();
-- --------- -  bl->lock = 0;
-- --------- -}
-- --------- -#else  /* !CONFIG_PARAVIRT */
              static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
              {
                return __ticket_spin_is_locked(lock);

diff --cc arch/x86/include/asm/system.h
index 2fcc70b,fa47b1e,8e626ea,8e626ea,8e626ea,8e626ea,8e626ea,8e626ea,8e626ea,8e626ea,8e626ea,8e626ea,8e626ea,8e626ea..c223837
--- 1/arch/x86/include/asm/system.h
--- 2/arch/x86/include/asm/system.h
--- 3/arch/x86/include/asm/system.h
--- 4/arch/x86/include/asm/system.h
--- 5/arch/x86/include/asm/system.h
--- 6/arch/x86/include/asm/system.h
--- 7/arch/x86/include/asm/system.h
--- 8/arch/x86/include/asm/system.h
--- 9/arch/x86/include/asm/system.h
--- 10/arch/x86/include/asm/system.h
--- 11/arch/x86/include/asm/system.h
--- 12/arch/x86/include/asm/system.h
--- 13/arch/x86/include/asm/system.h
--- 14/arch/x86/include/asm/system.h
+++ b/arch/x86/include/asm/system.h
@@@@@@@@@@@@@@@ -108,22 -94,19 -94,19 -94,19 -94,19 -94,19 -94,19 -94,19 -94,19 -94,19 -94,19 -94,19 -94,19 -94,19 +108,22 @@@@@@@@@@@@@@@ do {                                                                 
                     "call __switch_to\n\t"                                       \
                     ".globl thread_return\n"                                     \
                     "thread_return:\n\t"                                         \
 -------------       "movq %%gs:%P[pda_pcurrent],%%rsi\n\t"                       \
 +++++++++++++       "movq "__percpu_arg([current_task])",%%rsi\n\t"              \
 +++++++++++++       __switch_canary                                              \
                     "movq %P[thread_info](%%rsi),%%r8\n\t"                       \
- ------------       LOCK_PREFIX "btr  %[tif_fork],%P[ti_flags](%%r8)\n\t"        \
                     "movq %%rax,%%rdi\n\t"                                       \
- ------------       "jc   ret_from_fork\n\t"                                     \
+ ++++++++++++       "testl  %[_tif_fork],%P[ti_flags](%%r8)\n\t"         \
+ ++++++++++++       "jnz   ret_from_fork\n\t"                                    \
                     RESTORE_CONTEXT                                              \
                     : "=a" (last)                                                \
 +++++++++++++         __switch_canary_oparam                                     \
                     : [next] "S" (next), [prev] "D" (prev),                      \
                       [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
                       [ti_flags] "i" (offsetof(struct thread_info, flags)),      \
- ------------         [tif_fork] "i" (TIF_FORK),                                 \
+ ++++++++++++         [_tif_fork] "i" (_TIF_FORK),                               \
                       [thread_info] "i" (offsetof(struct task_struct, stack)),   \
 -------------         [pda_pcurrent] "i" (offsetof(struct x8664_pda, pcurrent))  \
 +++++++++++++         [current_task] "m" (per_cpu_var(current_task))             \
 +++++++++++++         __switch_canary_iparam                                     \
                     : "memory", "cc" __EXTRA_CLOBBER)
              #endif
              

diff --cc arch/x86/include/asm/thread_info.h
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/cpu/intel.c
index 549f2ad,8ea6929,8ea6929,20ce03a,8ea6929,8ea6929,8ea6929,8ea6929,8ea6929,8ea6929,8ea6929,8ea6929,8ea6929,430e5c3..5deefae
--- 1/arch/x86/kernel/cpu/intel.c
--- 2/arch/x86/kernel/cpu/intel.c
--- 3/arch/x86/kernel/cpu/intel.c
--- 4/arch/x86/kernel/cpu/intel.c
--- 5/arch/x86/kernel/cpu/intel.c
--- 6/arch/x86/kernel/cpu/intel.c
--- 7/arch/x86/kernel/cpu/intel.c
--- 8/arch/x86/kernel/cpu/intel.c
--- 9/arch/x86/kernel/cpu/intel.c
--- 10/arch/x86/kernel/cpu/intel.c
--- 11/arch/x86/kernel/cpu/intel.c
--- 12/arch/x86/kernel/cpu/intel.c
--- 13/arch/x86/kernel/cpu/intel.c
--- 14/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@@@@@@@@@@@@@@ -29,19 -29,6 -29,6 -29,6 -29,6 -29,6 -29,6 -29,6 -29,6 -29,6 -29,6 -29,6 -29,6 -29,19 +29,19 @@@@@@@@@@@@@@@
              
              static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
              {
-               if (c->x86 == 6 && c->x86_model >= 15) {
 ++++++++++++   /* Unmask CPUID levels if masked: */
+++++++++++++   if (c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xd)) {
 ++++++++++++           u64 misc_enable;
 ++++++++++++ 
 ++++++++++++           rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
 ++++++++++++ 
 ++++++++++++           if (misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) {
 ++++++++++++                   misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID;
 ++++++++++++                   wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
 ++++++++++++                   c->cpuid_level = cpuid_eax(0);
 ++++++++++++           }
 ++++++++++++   }
 ++++++++++++ 
                if ((c->x86 == 0xf && c->x86_model >= 0x03) ||
                        (c->x86 == 0x6 && c->x86_model >= 0x0e))
                        set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/head_32.S
Simple merge

diff --cc arch/x86/kernel/io_apic.c
Simple merge

diff --cc arch/x86/kernel/signal.c
Simple merge

diff --cc arch/x86/mm/fault.c
index 65709a6,9e268b6,9e268b6,90dfae5,90dfae5,90dfae5,9e268b6,8f4b859,90dfae5,90dfae5,90dfae5,90dfae5,9e268b6,90dfae5..d3eee74
--- 1/arch/x86/mm/fault.c
--- 2/arch/x86/mm/fault.c
--- 3/arch/x86/mm/fault.c
--- 4/arch/x86/mm/fault.c
--- 5/arch/x86/mm/fault.c
--- 6/arch/x86/mm/fault.c
--- 7/arch/x86/mm/fault.c
--- 8/arch/x86/mm/fault.c
--- 9/arch/x86/mm/fault.c
--- 10/arch/x86/mm/fault.c
--- 11/arch/x86/mm/fault.c
--- 12/arch/x86/mm/fault.c
--- 13/arch/x86/mm/fault.c
--- 14/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@@@@@@@@@@@@@ -415,12 -414,12 -414,12 -414,12 -414,12 -414,12 -414,12 -414,11 -414,12 -414,12 -414,12 -414,12 -414,12 -414,12 +415,11 @@@@@@@@@@@@@@@ static noinline void pgtable_bad(struc
              {
                unsigned long flags = oops_begin();
                int sig = SIGKILL;
 ------ ------  struct task_struct *tsk;
 ++++++ ++++++  struct task_struct *tsk = current;
              
                printk(KERN_ALERT "%s: Corrupted page table at address %lx\n",
 ------ ------         current->comm, address);
 ++++++ ++++++         tsk->comm, address);
                dump_pagetable(address);
------- ------  tsk = current;
                tsk->thread.cr2 = address;
                tsk->thread.trap_no = 14;
                tsk->thread.error_code = error_code;
@@@@@@@@@@@@@@@ -430,196 -429,6 -429,6 -429,6 -429,6 -429,6 -429,6 -428,190 -429,6 -429,6 -429,6 -429,6 -429,6 -429,6 +429,196 @@@@@@@@@@@@@@@
              }
              #endif
              
 ++++++ ++++++static noinline void no_context(struct pt_regs *regs,
 ++++++ ++++++                  unsigned long error_code, unsigned long address)
 ++++++ ++++++{
 ++++++ ++++++  struct task_struct *tsk = current;
 +++++++++++++  unsigned long *stackend;
 +++++++++++++
 ++++++ ++++++#ifdef CONFIG_X86_64
 ++++++ ++++++  unsigned long flags;
 ++++++ ++++++  int sig;
 ++++++ ++++++#endif
 ++++++ ++++++
 ++++++ ++++++  /* Are we prepared to handle this kernel fault?  */
 ++++++ ++++++  if (fixup_exception(regs))
 ++++++ ++++++          return;
 ++++++ ++++++
 ++++++ ++++++  /*
 ++++++ ++++++   * X86_32
 ++++++ ++++++   * Valid to do another page fault here, because if this fault
 ++++++ ++++++   * had been triggered by is_prefetch fixup_exception would have
 ++++++ ++++++   * handled it.
 ++++++ ++++++   *
 ++++++ ++++++   * X86_64
 ++++++ ++++++   * Hall of shame of CPU/BIOS bugs.
 ++++++ ++++++   */
 ++++++ ++++++  if (is_prefetch(regs, error_code, address))
 ++++++ ++++++          return;
 ++++++ ++++++
 ++++++ ++++++  if (is_errata93(regs, address))
 ++++++ ++++++          return;
 ++++++ ++++++
 ++++++ ++++++  /*
 ++++++ ++++++   * Oops. The kernel tried to access some bad page. We'll have to
 ++++++ ++++++   * terminate things with extreme prejudice.
 ++++++ ++++++   */
 ++++++ ++++++#ifdef CONFIG_X86_32
 ++++++ ++++++  bust_spinlocks(1);
 ++++++ ++++++#else
 ++++++ ++++++  flags = oops_begin();
 ++++++ ++++++#endif
 ++++++ ++++++
 ++++++ ++++++  show_fault_oops(regs, error_code, address);
 ++++++ ++++++
 +++++++++++++  stackend = end_of_stack(tsk);
 +++++++++++++  if (*stackend != STACK_END_MAGIC)
 +++++++++++++          printk(KERN_ALERT "Thread overran stack, or stack corrupted\n");
 +++++++++++++
 ++++++ ++++++  tsk->thread.cr2 = address;
 ++++++ ++++++  tsk->thread.trap_no = 14;
 ++++++ ++++++  tsk->thread.error_code = error_code;
 ++++++ ++++++
 ++++++ ++++++#ifdef CONFIG_X86_32
 ++++++ ++++++  die("Oops", regs, error_code);
 ++++++ ++++++  bust_spinlocks(0);
 ++++++ ++++++  do_exit(SIGKILL);
 ++++++ ++++++#else
 ++++++ ++++++  sig = SIGKILL;
 ++++++ ++++++  if (__die("Oops", regs, error_code))
 ++++++ ++++++          sig = 0;
 ++++++ ++++++  /* Executive summary in case the body of the oops scrolled away */
 ++++++ ++++++  printk(KERN_EMERG "CR2: %016lx\n", address);
 ++++++ ++++++  oops_end(flags, regs, sig);
 ++++++ ++++++#endif
 ++++++ ++++++}
 ++++++ ++++++
 ++++++ ++++++static void __bad_area_nosemaphore(struct pt_regs *regs,
 ++++++ ++++++                  unsigned long error_code, unsigned long address,
 ++++++ ++++++                  int si_code)
 ++++++ ++++++{
 ++++++ ++++++  struct task_struct *tsk = current;
 ++++++ ++++++
 ++++++ ++++++  /* User mode accesses just cause a SIGSEGV */
 ++++++ ++++++  if (error_code & PF_USER) {
 ++++++ ++++++          /*
 ++++++ ++++++           * It's possible to have interrupts off here.
 ++++++ ++++++           */
 ++++++ ++++++          local_irq_enable();
 ++++++ ++++++
 ++++++ ++++++          /*
 ++++++ ++++++           * Valid to do another page fault here because this one came
 ++++++ ++++++           * from user space.
 ++++++ ++++++           */
 ++++++ ++++++          if (is_prefetch(regs, error_code, address))
 ++++++ ++++++                  return;
 ++++++ ++++++
 ++++++ ++++++          if (is_errata100(regs, address))
 ++++++ ++++++                  return;
 ++++++ ++++++
 ++++++ ++++++          if (show_unhandled_signals && unhandled_signal(tsk, SIGSEGV) &&
 ++++++ ++++++              printk_ratelimit()) {
 ++++++ ++++++                  printk(
 ++++++ ++++++                  "%s%s[%d]: segfault at %lx ip %p sp %p error %lx",
 ++++++ ++++++                  task_pid_nr(tsk) > 1 ? KERN_INFO : KERN_EMERG,
 ++++++ ++++++                  tsk->comm, task_pid_nr(tsk), address,
 ++++++ ++++++                  (void *) regs->ip, (void *) regs->sp, error_code);
 ++++++ ++++++                  print_vma_addr(" in ", regs->ip);
 ++++++ ++++++                  printk("\n");
 ++++++ ++++++          }
 ++++++ ++++++
 ++++++ ++++++          tsk->thread.cr2 = address;
 ++++++ ++++++          /* Kernel addresses are always protection faults */
 ++++++ ++++++          tsk->thread.error_code = error_code | (address >= TASK_SIZE);
 ++++++ ++++++          tsk->thread.trap_no = 14;
 ++++++ ++++++          force_sig_info_fault(SIGSEGV, si_code, address, tsk);
 ++++++ ++++++          return;
 ++++++ ++++++  }
 ++++++ ++++++
 ++++++ ++++++  if (is_f00f_bug(regs, address))
 ++++++ ++++++          return;
 ++++++ ++++++
 ++++++ ++++++  no_context(regs, error_code, address);
 ++++++ ++++++}
 ++++++ ++++++
 ++++++ ++++++static noinline void bad_area_nosemaphore(struct pt_regs *regs,
 ++++++ ++++++                  unsigned long error_code, unsigned long address)
 ++++++ ++++++{
 ++++++ ++++++  __bad_area_nosemaphore(regs, error_code, address, SEGV_MAPERR);
 ++++++ ++++++}
 ++++++ ++++++
 ++++++ ++++++static void __bad_area(struct pt_regs *regs,
 ++++++ ++++++                  unsigned long error_code, unsigned long address,
 ++++++ ++++++                  int si_code)
 ++++++ ++++++{
 ++++++ ++++++  struct mm_struct *mm = current->mm;
 ++++++ ++++++
 ++++++ ++++++  /*
 ++++++ ++++++   * Something tried to access memory that isn't in our memory map..
 ++++++ ++++++   * Fix it, but check if it's kernel or user first..
 ++++++ ++++++   */
 ++++++ ++++++  up_read(&mm->mmap_sem);
 ++++++ ++++++
 ++++++ ++++++  __bad_area_nosemaphore(regs, error_code, address, si_code);
 ++++++ ++++++}
 ++++++ ++++++
 ++++++ ++++++static noinline void bad_area(struct pt_regs *regs,
 ++++++ ++++++                  unsigned long error_code, unsigned long address)
 ++++++ ++++++{
 ++++++ ++++++  __bad_area(regs, error_code, address, SEGV_MAPERR);
 ++++++ ++++++}
 ++++++ ++++++
 ++++++ ++++++static noinline void bad_area_access_error(struct pt_regs *regs,
 ++++++ ++++++                  unsigned long error_code, unsigned long address)
 ++++++ ++++++{
 ++++++ ++++++  __bad_area(regs, error_code, address, SEGV_ACCERR);
 ++++++ ++++++}
 ++++++ ++++++
 ++++++ ++++++/* TODO: fixup for "mm-invoke-oom-killer-from-page-fault.patch" */
 ++++++ ++++++static void out_of_memory(struct pt_regs *regs,
 ++++++ ++++++                  unsigned long error_code, unsigned long address)
 ++++++ ++++++{
 ++++++ ++++++  /*
 ++++++ ++++++   * We ran out of memory, call the OOM killer, and return the userspace
 ++++++ ++++++   * (which will retry the fault, or kill us if we got oom-killed).
 ++++++ ++++++   */
 ++++++ ++++++  up_read(&current->mm->mmap_sem);
 ++++++ ++++++  pagefault_out_of_memory();
 ++++++ ++++++}
 ++++++ ++++++
 ++++++ ++++++static void do_sigbus(struct pt_regs *regs,
 ++++++ ++++++                  unsigned long error_code, unsigned long address)
 ++++++ ++++++{
 ++++++ ++++++  struct task_struct *tsk = current;
 ++++++ ++++++  struct mm_struct *mm = tsk->mm;
 ++++++ ++++++
 ++++++ ++++++  up_read(&mm->mmap_sem);
 ++++++ ++++++
 ++++++ ++++++  /* Kernel mode? Handle exceptions or die */
 ++++++ ++++++  if (!(error_code & PF_USER))
 ++++++ ++++++          no_context(regs, error_code, address);
 ++++++ ++++++#ifdef CONFIG_X86_32
 ++++++ ++++++  /* User space => ok to do another page fault */
 ++++++ ++++++  if (is_prefetch(regs, error_code, address))
 ++++++ ++++++          return;
 ++++++ ++++++#endif
 ++++++ ++++++  tsk->thread.cr2 = address;
 ++++++ ++++++  tsk->thread.error_code = error_code;
 ++++++ ++++++  tsk->thread.trap_no = 14;
 ++++++ ++++++  force_sig_info_fault(SIGBUS, BUS_ADRERR, address, tsk);
 ++++++ ++++++}
 ++++++ ++++++
 ++++++ ++++++static noinline void mm_fault_error(struct pt_regs *regs,
 ++++++ ++++++          unsigned long error_code, unsigned long address, unsigned int fault)
 ++++++ ++++++{
 ++++++ ++++++  if (fault & VM_FAULT_OOM)
 ++++++ ++++++          out_of_memory(regs, error_code, address);
 ++++++ ++++++  else if (fault & VM_FAULT_SIGBUS)
 ++++++ ++++++          do_sigbus(regs, error_code, address);
 ++++++ ++++++  else
 ++++++ ++++++          BUG();
 ++++++ ++++++}
 ++++++ ++++++
              static int spurious_fault_check(unsigned long error_code, pte_t *pte)
              {
                if ((error_code & PF_WRITE) && !pte_write(*pte))

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

diff --cc arch/x86/mm/pat.c
index 7b61036,85cbd3c,85cbd3c,430cb44,8b08fb9,160c42d,85cbd3c,8b08fb9,8b08fb9,8b08fb9,8b08fb9,8b08fb9,85cbd3c,ffc88cc..9127e31
--- 1/arch/x86/mm/pat.c
--- 2/arch/x86/mm/pat.c
--- 3/arch/x86/mm/pat.c
--- 4/arch/x86/mm/pat.c
--- 5/arch/x86/mm/pat.c
--- 6/arch/x86/mm/pat.c
--- 7/arch/x86/mm/pat.c
--- 8/arch/x86/mm/pat.c
--- 9/arch/x86/mm/pat.c
--- 10/arch/x86/mm/pat.c
--- 11/arch/x86/mm/pat.c
--- 12/arch/x86/mm/pat.c
--- 13/arch/x86/mm/pat.c
--- 14/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@@@@@@@@@@@@@@ -618,13 -601,12 -601,12 -610,13 -601,13 -628,13 -601,12 -601,13 -601,13 -601,13 -601,13 -601,13 -601,12 -618,12 +627,13 @@@@@@@@@@@@@@@ void unmap_devmem(unsigned long pfn, un
               * Reserved non RAM regions only and after successful reserve_memtype,
               * this func also keeps identity mapping (if any) in sync with this new prot.
               */
 --   -     --static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t vma_prot)
 ++   +     ++static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
 ++   +     ++                          int strict_prot)
              {
                int is_ram = 0;
     -          int ret;
     +          int id_sz, ret;
                unsigned long flags;
 --   -     --  unsigned long want_flags = (pgprot_val(vma_prot) & _PAGE_CACHE_MASK);
 ++   +     ++  unsigned long want_flags = (pgprot_val(*vma_prot) & _PAGE_CACHE_MASK);
              
                is_ram = pagerange_is_ram(paddr, paddr + size);
              
@@@@@@@@@@@@@@@ -643,35 -625,26 -625,26 -635,35 -626,35 -653,27 -625,26 -626,35 -626,35 -626,35 -626,35 -626,35 -625,26 -642,26 +652,35 @@@@@@@@@@@@@@@
                        return ret;
              
                if (flags != want_flags) {
 --   -     --          free_memtype(paddr, paddr + size);
 --   -     --          printk(KERN_ERR
 --   -     --          "%s:%d map pfn expected mapping type %s for %Lx-%Lx, got %s\n",
 --   -     --                  current->comm, current->pid,
 --   -     --                  cattr_name(want_flags),
 --   -     --                  (unsigned long long)paddr,
 --   -     --                  (unsigned long long)(paddr + size),
 --   -     --                  cattr_name(flags));
 --   -     --          return -EINVAL;
 ++   +     ++          if (strict_prot || !is_new_memtype_allowed(want_flags, flags)) {
 ++   +     ++                  free_memtype(paddr, paddr + size);
 ++   +     ++                  printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
 ++   +     ++                          " for %Lx-%Lx, got %s\n",
 ++   +     ++                          current->comm, current->pid,
 ++   +     ++                          cattr_name(want_flags),
 ++   +     ++                          (unsigned long long)paddr,
 ++   +     ++                          (unsigned long long)(paddr + size),
 ++   +     ++                          cattr_name(flags));
 ++   +     ++                  return -EINVAL;
 ++   +     ++          }
 ++   +     ++          /*
 ++   +     ++           * We allow returning different type than the one requested in
 ++   +     ++           * non strict case.
 ++   +     ++           */
 ++   +     ++          *vma_prot = __pgprot((pgprot_val(*vma_prot) &
 ++   +     ++                                (~_PAGE_CACHE_MASK)) |
 ++   +     ++                               flags);
                }
              
     -          if (kernel_map_sync_memtype(paddr, size, flags)) {
     +          /* Need to keep identity mapping in sync */
     +          if (paddr >= __pa(high_memory))
     +                  return 0;
     +        
     +          id_sz = (__pa(high_memory) < paddr + size) ?
     +                                  __pa(high_memory) - paddr :
     +                                  size;
     +        
     +          if (ioremap_change_attr((unsigned long)__va(paddr), id_sz, flags) < 0) {
                        free_memtype(paddr, paddr + size);
                        printk(KERN_ERR
                                "%s:%d reserve_pfn_range ioremap_change_attr failed %s "

diff --cc arch/x86/xen/enlighten.c
Simple merge