diff options
| author | Olof Johansson <olof@lixom.net> | 2018-11-05 09:34:09 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-11-05 09:34:09 -0500 |
| commit | f55275bcc72948056387041abe9fce1c54300adc (patch) | |
| tree | ad06cec50340e64348d8cba9f9716ac962cc0130 | |
| parent | 651022382c7f8da46cb4872a545ee1da6d097d2a (diff) | |
ARM: defconfig: Disable PREEMPT again on multi_v7
I should have let this soak for a while in linux-next, since we have at
least one board that hit a regression from it. Revert from 4.20-rc, and
we'll queue it for next merge window once regression is fixed.
This reverts commit 513eb98595522bc0cb83831a9daee1d5738e66f1.
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 1c7616815a86..63af6234c1b6 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | CONFIG_SYSVIPC=y | 1 | CONFIG_SYSVIPC=y |
| 2 | CONFIG_NO_HZ=y | 2 | CONFIG_NO_HZ=y |
| 3 | CONFIG_HIGH_RES_TIMERS=y | 3 | CONFIG_HIGH_RES_TIMERS=y |
| 4 | CONFIG_PREEMPT=y | ||
| 5 | CONFIG_CGROUPS=y | 4 | CONFIG_CGROUPS=y |
| 6 | CONFIG_BLK_DEV_INITRD=y | 5 | CONFIG_BLK_DEV_INITRD=y |
| 7 | CONFIG_EMBEDDED=y | 6 | CONFIG_EMBEDDED=y |