From 78ce6499c059113032576fb13b6a808a42dacd35 Mon Sep 17 00:00:00 2001
From: Alexey Skobkin <skobkin-ru@ya.ru>
Date: Tue, 25 Sep 2018 14:25:20 +0300
Subject: [PATCH] desktop. 4.18.9. CONFIG_RETPOLINE=y, CONFIG_MZEN=y
 (-march=zenv1), CONFIG_AMD_MEM_ENCRYPT=y, CONFIG_MEMORY_FAILURE=y (ECC
 support), and other minor changes.

---
 desktop/.config | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/desktop/.config b/desktop/.config
index 5c36005..7089051 100644
--- a/desktop/.config
+++ b/desktop/.config
@@ -4,7 +4,7 @@
 #
 
 #
-# Compiler: gcc (Gentoo 8.2.0-r2 p1.2) 8.2.0
+# Compiler: gcc (Gentoo 8.2.0-r3 p1.3) 8.2.0
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -44,6 +44,7 @@ CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_DYNAMIC_PHYSICAL_MASK=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=80200
@@ -455,7 +456,7 @@ CONFIG_X86_FEATURE_NAMES=y
 # CONFIG_X86_X2APIC is not set
 # CONFIG_X86_MPPARSE is not set
 # CONFIG_GOLDFISH is not set
-# CONFIG_RETPOLINE is not set
+CONFIG_RETPOLINE=y
 # CONFIG_INTEL_RDT is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_INTEL_LPSS=y
@@ -476,7 +477,7 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_MPILEDRIVER is not set
 # CONFIG_MSTEAMROLLER is not set
 # CONFIG_MEXCAVATOR is not set
-# CONFIG_MZEN is not set
+CONFIG_MZEN=y
 # CONFIG_MPSC is not set
 # CONFIG_MATOM is not set
 # CONFIG_MCORE2 is not set
@@ -489,7 +490,7 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_MBROADWELL is not set
 # CONFIG_MSKYLAKE is not set
 # CONFIG_MSKYLAKEX is not set
-CONFIG_GENERIC_CPU=y
+# CONFIG_GENERIC_CPU is not set
 # CONFIG_MNATIVE is not set
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_L1_CACHE_SHIFT=6
@@ -547,7 +548,9 @@ CONFIG_X86_CPUID=y
 # CONFIG_X86_5LEVEL is not set
 CONFIG_X86_DIRECT_GBPAGES=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
-# CONFIG_AMD_MEM_ENCRYPT is not set
+CONFIG_AMD_MEM_ENCRYPT=y
+CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
 CONFIG_NUMA=y
 # CONFIG_AMD_NUMA is not set
 CONFIG_X86_64_ACPI_NUMA=y
@@ -587,7 +590,8 @@ CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
+CONFIG_MEMORY_FAILURE=y
+# CONFIG_HWPOISON_INJECT is not set
 CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
 CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
@@ -735,6 +739,7 @@ CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
+# CONFIG_ACPI_APEI_MEMORY_FAILURE is not set
 # CONFIG_ACPI_APEI_EINJ is not set
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
 # CONFIG_DPTF_POWER is not set
@@ -4145,6 +4150,7 @@ CONFIG_ARM_GIC_MAX_NR=1
 # Performance monitor support
 #
 CONFIG_RAS=y
+# CONFIG_RAS_CEC is not set
 # CONFIG_THUNDERBOLT is not set
 
 #