UBUNTU: [Config] arm64: snapdragon: HWSPINLOCK_QCOM=y

[mirror_ubuntu-bionic-kernel.git] / debian.master / config / config.common.ubuntu

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 268c198f5c9a3e77237d2924f5ff8b53e6f87cd2..035cd85e8c9477bfa48437647291bf135db12a00 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -986,7 +986,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_BLK_DEV_NVME=y
+CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -1624,7 +1624,6 @@ CONFIG_COMMON_CLK_PALMAS=m
 # CONFIG_COMMON_CLK_PIC32 is not set
 CONFIG_COMMON_CLK_PWM=m
 # CONFIG_COMMON_CLK_PXA is not set
-CONFIG_COMMON_CLK_QCOM=m
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SAMSUNG=y
@@ -2109,10 +2108,6 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=1
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_SECURITY="apparmor"
 CONFIG_DEFAULT_SECURITY_APPARMOR=y
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -2730,8 +2725,8 @@ CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der"
 # CONFIG_EXOFS_DEBUG is not set
 CONFIG_EXPERT=y
 CONFIG_EXPOLINE=y
-CONFIG_EXPOLINE_FULL=y
-# CONFIG_EXPOLINE_MEDIUM is not set
+CONFIG_EXPOLINE_AUTO=y
+# CONFIG_EXPOLINE_FULL is not set
 # CONFIG_EXPOLINE_OFF is not set
 CONFIG_EXPORTFS=y
 CONFIG_EXPORTFS_BLOCK_OPS=y
@@ -3066,6 +3061,7 @@ CONFIG_FSL_PQ_MDIO=m
 CONFIG_FSL_XGMAC_MDIO=y
 CONFIG_FSNOTIFY=y
 CONFIG_FS_DAX=y
+CONFIG_FS_DAX_LIMITED=y
 CONFIG_FS_DAX_PMD=y
 CONFIG_FS_ENCRYPTION=y
 CONFIG_FS_IOMAP=y
@@ -3721,7 +3717,6 @@ CONFIG_HWLAT_TRACER=y
 CONFIG_HWMON_VID=m
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HWSPINLOCK_OMAP=m
-CONFIG_HWSPINLOCK_QCOM=m
 CONFIG_HWSPINLOCK_SPRD=m
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_PERF_EVENTS=y
@@ -3833,6 +3828,7 @@ CONFIG_I2C_PIIX4=m
 CONFIG_I2C_PXA=m
 # CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_PXA_SLAVE=y
+# CONFIG_I2C_QCOM_CCI is not set
 CONFIG_I2C_QUP=m
 CONFIG_I2C_RCAR=m
 CONFIG_I2C_RIIC=m
@@ -4626,7 +4622,7 @@ CONFIG_KEMPLD_WDT=m
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_LZO is not set
 CONFIG_KERNEL_MODE_NEON=y
-CONFIG_KERNEL_NOBP=y
+# CONFIG_KERNEL_NOBP is not set
 CONFIG_KERNEL_START=0xc000000000000000
 CONFIG_KERNFS=y
 CONFIG_KEXEC=y
@@ -4813,6 +4809,7 @@ CONFIG_LEDS_PCA963X=m
 CONFIG_LEDS_PM8058=m
 CONFIG_LEDS_POWERNV=m
 CONFIG_LEDS_PWM=m
+# CONFIG_LEDS_QCOM_LPG is not set
 CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_TCA6507=m
@@ -5499,7 +5496,6 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_MSI_LAPTOP=m
 CONFIG_MSI_WMI=m
 CONFIG_MSM_GCC_8660=m
-CONFIG_MSM_GCC_8916=m
 CONFIG_MSM_GCC_8960=m
 CONFIG_MSM_GCC_8974=m
 CONFIG_MSM_GCC_8994=m
@@ -6262,7 +6258,7 @@ CONFIG_NVMEM_IMX_OCOTP=m
 CONFIG_NVMEM_SNVS_LPGPR=m
 CONFIG_NVMEM_SUNXI_SID=m
 # CONFIG_NVMEM_VF610_OCOTP is not set
-CONFIG_NVME_CORE=y
+CONFIG_NVME_CORE=m
 CONFIG_NVME_FABRICS=m
 CONFIG_NVME_FC=m
 CONFIG_NVME_MULTIPATH=y
@@ -6701,7 +6697,6 @@ CONFIG_PINCTRL_MESON8B=y
 CONFIG_PINCTRL_MESON8_PMX=y
 CONFIG_PINCTRL_MSM=y
 CONFIG_PINCTRL_MSM8660=m
-CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_MSM8960=m
 CONFIG_PINCTRL_MSM8994=m
 CONFIG_PINCTRL_MSM8996=m
@@ -7026,12 +7021,15 @@ CONFIG_PXA168_ETH=m
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
 CONFIG_QCA7000_UART=m
+CONFIG_QCOM_A53PLL=y
 CONFIG_QCOM_ADSP_PIL=m
 CONFIG_QCOM_APCS_IPC=m
 CONFIG_QCOM_BAM_DMA=m
+CONFIG_QCOM_CLK_APCS_MSM8916=y
 CONFIG_QCOM_CLK_RPM=m
 CONFIG_QCOM_CLK_SMD_RPM=m
 CONFIG_QCOM_COINCELL=m
+# CONFIG_QCOM_CPR is not set
 CONFIG_QCOM_EBI2=y
 CONFIG_QCOM_EMAC=m
 CONFIG_QCOM_FALKOR_ERRATUM_1003=y
@@ -7811,9 +7809,13 @@ CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 # CONFIG_SECURITY_APPARMOR_DEBUG is not set
 CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+CONFIG_SECURITY_APPARMOR_STACKED=y
+CONFIG_SECURITY_DEFAULT_DISPLAY_APPARMOR=y
+CONFIG_SECURITY_DEFAULT_DISPLAY_NAME="apparmor"
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY_INFINIBAND=y
 # CONFIG_SECURITY_LOADPIN is not set
+# CONFIG_SECURITY_LSM_DEBUG is not set
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
@@ -7824,16 +7826,20 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 # CONFIG_SECURITY_SELINUX_DISABLE is not set
+# CONFIG_SECURITY_SELINUX_STACKED is not set
 CONFIG_SECURITY_SMACK=y
 CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y
 # CONFIG_SECURITY_SMACK_BRINGUP is not set
 CONFIG_SECURITY_SMACK_NETFILTER=y
+# CONFIG_SECURITY_SMACK_STACKED is not set
+CONFIG_SECURITY_STACKING=y
 CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
 CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+# CONFIG_SECURITY_TOMOYO_STACKED is not set
 # CONFIG_SECURITY_WRITABLE_HOOKS is not set
 CONFIG_SECURITY_YAMA=y
 CONFIG_SELECT_MEMORY_MODEL=y
@@ -9328,8 +9334,6 @@ CONFIG_TRACING_EVENTS_GPIO=y
 CONFIG_TRACING_MAP=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y