Merge tag 'asoc-fix-v4.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v4.4

A collection of small driver specific fixes here, nothing that'll affect
users who don't have the devices concerned.  At least the wm8974 bug
indicates that there's not too many users of some of these devices.

3 files changed, 13 insertions, 18 deletions

diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c
index a035c2aa7801..0f1c6fc3ddd8 100644
--- a/arch/x86/mm/dump_pagetables.c
+++ b/arch/x86/mm/dump_pagetables.c
@@ -89,7 +89,7 @@ static struct addr_marker address_markers[] = {
         { 0/* VMALLOC_START */, "vmalloc() Area" },
         { 0/*VMALLOC_END*/,     "vmalloc() End" },
 # ifdef CONFIG_HIGHMEM
-        { 0/*PKMAP_BASE*/,      "Persisent kmap() Area" },
+        { 0/*PKMAP_BASE*/,      "Persistent kmap() Area" },
 # endif
         { 0/*FIXADDR_START*/,   "Fixmap Area" },
 #endif
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index ac161db63388..cb5e266a8bf7 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -2495,14 +2495,9 @@ void __init xen_init_mmu_ops(void)
 {
         x86_init.paging.pagetable_init = xen_pagetable_init;
 
-        /* Optimization - we can use the HVM one but it has no idea which
-         * VCPUs are descheduled - which means that it will needlessly IPI
-         * them. Xen knows so let it do the job.
-         */
-        if (xen_feature(XENFEAT_auto_translated_physmap)) {
-                pv_mmu_ops.flush_tlb_others = xen_flush_tlb_others;
+        if (xen_feature(XENFEAT_auto_translated_physmap))
                 return;
-        }
+
         pv_mmu_ops = xen_mmu_ops;
 
         memset(dummy_mapping, 0xff, PAGE_SIZE);
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
index feddabdab448..3705eabd7e22 100644
--- a/arch/x86/xen/suspend.c
+++ b/arch/x86/xen/suspend.c
@@ -68,26 +68,16 @@ static void xen_pv_post_suspend(int suspend_cancelled)
 
 void xen_arch_pre_suspend(void)
 {
-        int cpu;
-
-        for_each_online_cpu(cpu)
-                xen_pmu_finish(cpu);
-
         if (xen_pv_domain())
                 xen_pv_pre_suspend();
 }
 
 void xen_arch_post_suspend(int cancelled)
 {
-        int cpu;
-
         if (xen_pv_domain())
                 xen_pv_post_suspend(cancelled);
         else
                 xen_hvm_post_suspend(cancelled);
-
-        for_each_online_cpu(cpu)
-                xen_pmu_init(cpu);
 }
 
 static void xen_vcpu_notify_restore(void *data)
@@ -106,10 +96,20 @@ static void xen_vcpu_notify_suspend(void *data)
 
 void xen_arch_resume(void)
 {
+        int cpu;
+
         on_each_cpu(xen_vcpu_notify_restore, NULL, 1);
+
+        for_each_online_cpu(cpu)
+                xen_pmu_init(cpu);
 }
 
 void xen_arch_suspend(void)
 {
+        int cpu;
+
+        for_each_online_cpu(cpu)
+                xen_pmu_finish(cpu);
+
         on_each_cpu(xen_vcpu_notify_suspend, NULL, 1);
 }