Merge branch 'stable/for-linus-3.9-take-two' into linux-next

* stable/for-linus-3.9-take-two:
  xen/mmu: On early bootup, flush the TLB when changing RO->RW bits Xen provided pagetables.
  xen/events: Handle VIRQ_TIMER before any other hardirq in event loop.

Conflicts:
	arch/x86/xen/mmu.c

diff --cc arch/x86/xen/mmu.c
index 750f1854516b1bb23df2ac1a35643f525cc299ea,a4ea92477e016e252ca96037a9654fed4e399e57..0faa74479d7deff315d238303168f27a7c125388
--- 1/arch/x86/xen/mmu.c
--- 2/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@@ -1761,13 -1753,13 +1761,17 @@@ static void set_page_prot_flags(void *a
        unsigned long pfn = __pa(addr) >> PAGE_SHIFT;
        pte_t pte = pfn_pte(pfn, prot);
  
-       if (HYPERVISOR_update_va_mapping((unsigned long)addr, pte, 0))
 +      /* recall for PVH, page tables are native. */
 +      if (xen_feature(XENFEAT_auto_translated_physmap))
 +              return;
 +
+       if (HYPERVISOR_update_va_mapping((unsigned long)addr, pte, flags))
                BUG();
  }
+ static void set_page_prot(void *addr, pgprot_t prot)
+ {
+       return set_page_prot_flags(addr, prot, UVMF_NONE);
+ }
  #ifdef CONFIG_X86_32
  static void __init xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn)
  {

diff --cc drivers/xen/events.c
Simple merge