2 files changed, 8 insertions, 16 deletions

diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
index 857e492c571e..bbeb0c3fbd90 100644
--- a/arch/x86/boot/compressed/relocs.c
+++ b/arch/x86/boot/compressed/relocs.c
@@ -504,8 +504,11 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
                         if (sym->st_shndx == SHN_ABS) {
                                 continue;
                         }
-                        if (r_type == R_386_PC32) {
-                                /* PC relative relocations don't need to be adjusted */
+                        if (r_type == R_386_NONE || r_type == R_386_PC32) {
+                                /*
+                                 * NONE can be ignored and and PC relative
+                                 * relocations don't need to be adjusted.
+                                 */
                         }
                         else if (r_type == R_386_32) {
                                 /* Visit relocations that need to be adjusted */
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 0f9052bcec4b..e17efed088c5 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -204,30 +204,19 @@ static void cpa_flush_range(unsigned long start, int numpages, int cache)
         }
 }
 
-static void wbinvd_local(void *unused)
-{
-        wbinvd();
-}
-
 static void cpa_flush_array(unsigned long *start, int numpages, int cache,
                             int in_flags, struct page **pages)
 {
         unsigned int i, level;
+        unsigned long do_wbinvd = cache && numpages >= 1024; /* 4M threshold */
 
         BUG_ON(irqs_disabled());
 
-        on_each_cpu(__cpa_flush_range, NULL, 1);
+        on_each_cpu(__cpa_flush_all, (void *) do_wbinvd, 1);
 
-        if (!cache)
+        if (!cache || do_wbinvd)
                 return;
 
-        /* 4M threshold */
-        if (numpages >= 1024) {
-                if (boot_cpu_data.x86 >= 4)
-                        on_each_cpu(wbinvd_local, NULL, 1);
-
-                return;
-        }
         /*
          * We only need to flush on one CPU,
          * clflush is a MESI-coherent instruction that