UBUNTU: SAUCE: Remove #define X86_FEATURE_PTI

CVE-2018-3639 (x86)

Internally, kernel 4.4 uses the term KAISER instead of PTI, so drop
X86_FEATURE_PTI (since X86_FEATURE_KAISER exists) and also rename
DISABLE_PTI.

Fixes: b2f8503b ("x86/cpufeatures: Add X86_BUG_CPU_INSECURE")
Signed-off-by: Juerg Haefliger <juergh@canonical.com>

arch/x86/include/asm/cpufeatures.h

@@ -192,7 +192,6 @@
 
 #define X86_FEATURE_HW_PSTATE	( 7*32+ 8) /* AMD HW-PState */
 #define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */
-#define X86_FEATURE_PTI			( 7*32+11) /* Kernel Page Table Isolation enabled */
 
 #define X86_FEATURE_INTEL_PT	( 7*32+15) /* Intel Processor Trace */
 #define X86_FEATURE_RSB_CTXSW	( 7*32+19) /* Fill RSB on context switches */

arch/x86/include/asm/disabled-features.h

@@ -31,9 +31,9 @@
 #endif /* CONFIG_X86_64 */
 
 #ifdef CONFIG_PAGE_TABLE_ISOLATION
-# define DISABLE_PTI		0
+# define DISABLE_KAISER		0
 #else
-# define DISABLE_PTI		(1 << (X86_FEATURE_PTI & 31))
+# define DISABLE_KAISER		(1 << (X86_FEATURE_KAISER & 31))
 #endif
 
 /*
@@ -46,7 +46,7 @@
 #define DISABLED_MASK4	(DISABLE_PCID)
 #define DISABLED_MASK5	0
 #define DISABLED_MASK6	0
-#define DISABLED_MASK7	(DISABLE_PTI)
+#define DISABLED_MASK7	(DISABLE_KAISER)
 #define DISABLED_MASK8	0
 #define DISABLED_MASK9	(DISABLE_MPX)