Revert "UBUNTU: SAUCE: rfi-flush: Use rfi-flush in printks"

This reverts commit 9fb6d750.

CVE-2017-5754

BugLink: http://bugs.launchpad.net/bugs/1756121

The functionality of this commit will be provided by the following
upstream patch series:
  * powerpc/64s: Allow control of RFI flush via debugfs
  * powerpc/64s: Wire up cpu_show_meltdown()
  * powerpc/powernv: Check device-tree for RFI flush settings
  * powerpc/pseries: Query hypervisor for RFI flush settings
  * powerpc/64s: Support disabling RFI flush with no_rfi_flush and nopti
  * powerpc/64s: Add support for RFI flush of L1-D cache
  * powerpc/64s: Convert slb_miss_common to use RFI_TO_USER/KERNEL
  * powerpc/64: Convert the syscall exit path to use RFI_TO_USER/KERNEL
  * powerpc/64: Convert fast_exception_return to use RFI_TO_USER/KERNEL
  * powerpc/64s: Simple RFI macro conversions
  * powerpc/64: Add macros for annotating the destination of rfid/hrfid
  * powerpc/pseries: Add H_GET_CPU_CHARACTERISTICS flags & wrapper
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

arch/powerpc/kernel/setup_64.c

@@ -887,7 +887,7 @@ void __init setup_rfi_flush(enum l1d_flush_type types, bool enable)
 		u64 l1d_size = ppc64_caches.dsize;
 		u64 limit = min(safe_stack_limit(), ppc64_rma_size);
 
-		pr_info("rfi-flush: Using fallback displacement flush\n");
+		pr_info("rfi-fixups: Using fallback displacement flush\n");
 
 		/*
 		 * Align to L1d size, and size it at 2x L1d size, to
@@ -917,10 +917,10 @@ void __init setup_rfi_flush(enum l1d_flush_type types, bool enable)
 	}
 
 	if (types & L1D_FLUSH_ORI)
-		pr_info("rfi-flush: Using ori type flush\n");
+		pr_info("rfi-fixups: Using ori type flush\n");
 
 	if (types & L1D_FLUSH_MTTRIG)
-		pr_info("rfi-flush: Using mttrig type flush\n");
+		pr_info("rfi-fixups: Using mttrig type flush\n");
 
 	enabled_flush_types = types;
 

arch/powerpc/lib/feature-fixups.c

@@ -151,7 +151,7 @@ void do_rfi_flush_fixups(enum l1d_flush_type types)
 		patch_instruction(dest + 2, instrs[2]);
 	}
 
-	printk(KERN_DEBUG "rfi-flush: patched %d locations\n", i);
+	printk(KERN_DEBUG "rfi-fixups: patched %d locations\n", i);
 }
 #endif /* CONFIG_PPC_BOOK3S_64 */