summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGaurav Sarode <gsarode@nvidia.com>2012-06-05 03:41:53 -0700
committerSimone Willett <swillett@nvidia.com>2012-06-06 17:35:28 -0700
commit13f96891bd002d9626d535f9eb5786f2c65810ad (patch)
tree6f5ad6dae0e2df350c3a8c75f69e9d2e854bcd82 /arch
parent3b080222a7b37c31fe73be90c3e681096f8b82dd (diff)
Revert "ARM: defconfig: Remove SYSRQ support."
We need SYSRQ during reboot to remount all the partitions as RO. Otherwise all the partitions will be corrupted. This reverts commit 2eea8dc6392dadce503ed9a9f709da3cab8d11ad Bug 978676 Change-Id: I6d04ac284da174c161fb61f9f590715d4e6ac470 Signed-off-by: Gaurav Sarode <gsarode@nvidia.com> Reviewed-on: http://git-master/r/106447 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tegra3_android_defconfig2
-rw-r--r--arch/arm/configs/tegra_android_defconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig
index 50da47699f9f..af04716cc0cb 100644
--- a/arch/arm/configs/tegra3_android_defconfig
+++ b/arch/arm/configs/tegra3_android_defconfig
@@ -445,7 +445,7 @@ CONFIG_EFI_PARTITION=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ISO8859_1=y
CONFIG_PRINTK_TIME=y
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_SECTION_MISMATCH=y
CONFIG_DEBUG_FS=y
CONFIG_LOCKUP_DETECTOR=y
diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig
index 3cb78ad0741e..a129a8ee5a10 100644
--- a/arch/arm/configs/tegra_android_defconfig
+++ b/arch/arm/configs/tegra_android_defconfig
@@ -371,6 +371,7 @@ CONFIG_EFI_PARTITION=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ISO8859_1=y
CONFIG_PRINTK_TIME=y
+CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
CONFIG_LOCKUP_DETECTOR=y
# CONFIG_DETECT_HUNG_TASK is not set
@@ -383,4 +384,3 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_TWOFISH=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_DEV_TEGRA_AES=y
-# CONFIG_MAGIC_SYSRQ is not set