diff --git a/arch/arm/configs/shamu_defconfig b/arch/arm/configs/shamu_defconfig
index c099ebef67bc8d1eb597be3a03914779df3fe14c..ae02b9d8c687803b772a3df7463dfc6adc4e995c 100644
--- a/arch/arm/configs/shamu_defconfig
+++ b/arch/arm/configs/shamu_defconfig
@@ -9,6 +9,7 @@ CONFIG_RCU_FAST_NO_HZ=y
 CONFIG_LOG_BUF_SHIFT=20
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
 CONFIG_CGROUP_SCHED=y
@@ -242,7 +243,6 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_UID_STAT=y
-CONFIG_UID_CPUTIME=y
 CONFIG_QSEECOM=y
 CONFIG_QPNP_MISC=y
 CONFIG_TI_DRV2667=y
@@ -252,6 +252,7 @@ CONFIG_C55_CTRL=y
 CONFIG_MMI_FACTORY=y
 CONFIG_MMI_SAR=y
 CONFIG_ALSA_TO_H2W=y
+CONFIG_UID_CPUTIME=y
 CONFIG_CYPRESS_CAPSENSE_PROGRAMMING=y
 CONFIG_SCSI=y
 CONFIG_SCSI_TGT=y
@@ -548,6 +549,7 @@ CONFIG_SPS_SUPPORT_NDP_BAM=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_CLKDIV=y
 CONFIG_QPNP_USB_DETECT=y
+CONFIG_MSM_AVTIMER=y
 CONFIG_QCA1530=y
 CONFIG_REMOTE_SPINLOCK_MSM=y
 CONFIG_MSM_IOMMU_V1=y
@@ -605,10 +607,9 @@ CONFIG_SECURITY_SELINUX=y
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_XCBC=y
 CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_AES_ARM_BS=y
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_DEV_QCRYPTO=y
 CONFIG_CRYPTO_DEV_QCE=y
 CONFIG_CRYPTO_DEV_QCEDEV=y
-CONFIG_CRYPTO_SHA256_ARM=y
-CONFIG_MSM_AVTIMER=y