From 86d9b7dd6bc78494998dcfcad43d1b23e2168341 Mon Sep 17 00:00:00 2001
From: Yang Yingliang <yangyingliang@huawei.com>
Date: Wed, 30 Jan 2019 15:27:46 +0800
Subject: [PATCH] config: re-generate hulk_defconfig based on LTS 4.19.18

euler inclusion
category: bugfix
Bugzilla: 5521
CVE: N/A

------------------------------------------------------------------------

re-generate hulk_defconfig based on LTS 4.19.18
---
 arch/arm64/configs/hulk_defconfig | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig
index 8c023a29f143..54326e425fe0 100644
--- a/arch/arm64/configs/hulk_defconfig
+++ b/arch/arm64/configs/hulk_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.19.15 Kernel Configuration
+# Linux/arm64 4.19.18 Kernel Configuration
 #
 
 #
@@ -282,6 +282,12 @@ CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
 # CONFIG_ARCH_ZX is not set
 CONFIG_ARCH_ZYNQMP=y
+CONFIG_HAVE_LIVEPATCH_WO_FTRACE=y
+
+#
+# Enable Livepatch
+#
+# CONFIG_LIVEPATCH is not set
 
 #
 # Bus support
@@ -536,6 +542,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 #
 # CONFIG_CPUFREQ_DT is not set
 CONFIG_ACPI_CPPC_CPUFREQ=y
+CONFIG_HISILICON_CPPC_CPUFREQ_WORKAROUND=y
 # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
 # CONFIG_ARM_MEDIATEK_CPUFREQ is not set
 CONFIG_ARM_TEGRA20_CPUFREQ=y
@@ -4737,6 +4744,7 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 # CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_TTM=y
@@ -5798,7 +5806,6 @@ CONFIG_UIO_PCI_GENERIC=y
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_MF624 is not set
-CONFIG_VFIO_IOMMU_TYPE1=y
 CONFIG_VFIO_VIRQFD=y
 CONFIG_VFIO=y
 # CONFIG_VFIO_NOIOMMU is not set
-- 
GitLab