Merge "defconfigs: Sync up defconfigs"

This commit is contained in:
Linux Build Service Account 2017-05-03 23:31:47 -07:00 committed by Gerrit - the friendly Code Review server
commit bf5ab4a6aa
5 changed files with 16 additions and 7 deletions

View file

@ -3,6 +3,9 @@ CONFIG_AUDIT=y
CONFIG_NO_HZ=y CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y CONFIG_HIGH_RES_TIMERS=y
CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_IRQ_TIME_ACCOUNTING=y
CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_RCU_EXPERT=y CONFIG_RCU_EXPERT=y
CONFIG_RCU_FAST_NO_HZ=y CONFIG_RCU_FAST_NO_HZ=y
CONFIG_IKCONFIG=y CONFIG_IKCONFIG=y
@ -242,7 +245,7 @@ CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_QSEECOM=y CONFIG_QSEECOM=y
CONFIG_HDCP_QSEECOM=y CONFIG_HDCP_QSEECOM=y
CONFIG_UID_CPUTIME=y CONFIG_UID_SYS_STATS=y
CONFIG_QPNP_MISC=y CONFIG_QPNP_MISC=y
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
@ -527,7 +530,6 @@ CONFIG_MSM_MMCC_660=y
CONFIG_CLOCK_CPU_OSM=y CONFIG_CLOCK_CPU_OSM=y
CONFIG_QCOM_MDSS_PLL=y CONFIG_QCOM_MDSS_PLL=y
CONFIG_REMOTE_SPINLOCK_MSM=y CONFIG_REMOTE_SPINLOCK_MSM=y
CONFIG_IOMMU_IO_PGTABLE_FAST=y
CONFIG_ARM_SMMU=y CONFIG_ARM_SMMU=y
CONFIG_IOMMU_DEBUG=y CONFIG_IOMMU_DEBUG=y
CONFIG_IOMMU_DEBUG_TRACKING=y CONFIG_IOMMU_DEBUG_TRACKING=y

View file

@ -529,8 +529,6 @@ CONFIG_MSM_MMCC_660=y
CONFIG_CLOCK_CPU_OSM=y CONFIG_CLOCK_CPU_OSM=y
CONFIG_QCOM_MDSS_PLL=y CONFIG_QCOM_MDSS_PLL=y
CONFIG_REMOTE_SPINLOCK_MSM=y CONFIG_REMOTE_SPINLOCK_MSM=y
CONFIG_IOMMU_IO_PGTABLE_FAST=y
CONFIG_IOMMU_IO_PGTABLE_FAST_SELFTEST=y
CONFIG_ARM_SMMU=y CONFIG_ARM_SMMU=y
CONFIG_IOMMU_DEBUG=y CONFIG_IOMMU_DEBUG=y
CONFIG_IOMMU_DEBUG_TRACKING=y CONFIG_IOMMU_DEBUG_TRACKING=y

View file

@ -5,6 +5,9 @@ CONFIG_AUDIT=y
CONFIG_NO_HZ=y CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y CONFIG_HIGH_RES_TIMERS=y
CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_IRQ_TIME_ACCOUNTING=y
CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_RCU_EXPERT=y CONFIG_RCU_EXPERT=y
CONFIG_RCU_FAST_NO_HZ=y CONFIG_RCU_FAST_NO_HZ=y
CONFIG_IKCONFIG=y CONFIG_IKCONFIG=y
@ -242,7 +245,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_QSEECOM=y CONFIG_QSEECOM=y
CONFIG_HDCP_QSEECOM=y CONFIG_HDCP_QSEECOM=y
CONFIG_PROFILER=y CONFIG_PROFILER=y
CONFIG_UID_CPUTIME=y CONFIG_UID_SYS_STATS=y
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_SG=y CONFIG_CHR_DEV_SG=y

View file

@ -4,6 +4,9 @@ CONFIG_AUDIT=y
CONFIG_NO_HZ=y CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y CONFIG_HIGH_RES_TIMERS=y
CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_IRQ_TIME_ACCOUNTING=y
CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_RCU_EXPERT=y CONFIG_RCU_EXPERT=y
CONFIG_IKCONFIG=y CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y CONFIG_IKCONFIG_PROC=y
@ -234,7 +237,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_QSEECOM=y CONFIG_QSEECOM=y
CONFIG_HDCP_QSEECOM=y CONFIG_HDCP_QSEECOM=y
CONFIG_PROFILER=y CONFIG_PROFILER=y
CONFIG_UID_CPUTIME=y CONFIG_UID_SYS_STATS=y
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_SG=y CONFIG_CHR_DEV_SG=y

View file

@ -4,6 +4,9 @@ CONFIG_AUDIT=y
CONFIG_NO_HZ=y CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y CONFIG_HIGH_RES_TIMERS=y
CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_IRQ_TIME_ACCOUNTING=y
CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_RCU_EXPERT=y CONFIG_RCU_EXPERT=y
CONFIG_IKCONFIG=y CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y CONFIG_IKCONFIG_PROC=y
@ -242,7 +245,7 @@ CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_QSEECOM=y CONFIG_QSEECOM=y
CONFIG_HDCP_QSEECOM=y CONFIG_HDCP_QSEECOM=y
CONFIG_UID_CPUTIME=y CONFIG_UID_SYS_STATS=y
CONFIG_QPNP_MISC=y CONFIG_QPNP_MISC=y
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y