commit d37a4df800edaca60a54cd96eef08880c63862b9
author Avery Pennarun <apenwarr@gmail.com> Wed Aug 13 20:59:15 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 12 20:11:38 2014 +0000
tree 1d950a32d3e9e057886d41439916b67e5faba96f
parent fafcc82a0f782b55fba363ed6041671413f55b36
parent 3a9fa759705797c795f1754c543f0136455a90ef

Merge "gfrg200_defconfig: enable preemptible kernel."

arch/arm/configs/gfrg200_defconfig

diff --git a/arch/arm/configs/gfrg200_defconfig b/arch/arm/configs/gfrg200_defconfig
index bc5ff42..e4606c8 100644
--- a/arch/arm/configs/gfrg200_defconfig
+++ b/arch/arm/configs/gfrg200_defconfig
@@ -4,6 +4,8 @@
 CONFIG_SYSVIPC=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_RCU_BOOST=y
+CONFIG_RCU_BOOST_DELAY=50
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_DEVICE=y
@@ -40,6 +42,7 @@
 # CONFIG_SMP_ON_UP is not set
 CONFIG_VMSPLIT_2G=y
 CONFIG_NR_CPUS=2
+CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 CONFIG_ZBOOT_ROM_TEXT=0x3008000
@@ -290,6 +293,8 @@
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
 # CONFIG_SCHED_DEBUG is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_RCU_CPU_STALL_VERBOSE is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_ARM_UNWIND is not set