Revert "UBUNTU: SAUCE: rfi-flush: Make l1d_flush_type bit flags"

This reverts commit 0929d8b8.

CVE-2017-5754

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

The functionality of this commit is 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/include/asm/setup.h

@@ -27,12 +27,11 @@ void initmem_init(void);
 
 void rfi_flush_enable(bool enable);
 
-/* These are bit flags */
 enum l1d_flush_type {
-	L1D_FLUSH_NONE		= 0x1,
-	L1D_FLUSH_FALLBACK	= 0x2,
-	L1D_FLUSH_ORI		= 0x4,
-	L1D_FLUSH_MTTRIG	= 0x8,
+	L1D_FLUSH_NONE,
+	L1D_FLUSH_FALLBACK,
+	L1D_FLUSH_ORI,
+	L1D_FLUSH_MTTRIG,
 };
 
 void __init setup_rfi_flush(enum l1d_flush_type, bool enable);