aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-05-15 16:38:02 +0200
committerFelix Fietkau <nbd@nbd.name>2016-05-15 21:28:41 +0200
commit2ecf3af576946fe53995e1bc1489d136fb72c3a5 (patch)
treebf774f18c610c7961cc2531efd877792f1117bd8
parentf4c4d501e4edc579e74e720b0a9e3f22532b0dab (diff)
downloadupstream-2ecf3af576946fe53995e1bc1489d136fb72c3a5.tar.gz
upstream-2ecf3af576946fe53995e1bc1489d136fb72c3a5.tar.bz2
upstream-2ecf3af576946fe53995e1bc1489d136fb72c3a5.zip
kernel: set CONFIG_PANIC_TIMEOUT by default
Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--target/linux/generic/config-3.182
-rw-r--r--target/linux/generic/config-4.12
-rw-r--r--target/linux/generic/config-4.42
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index c68b3fb50b..e8745a02c0 100644
--- a/target/linux/generic/config-3.18
+++ b/target/linux/generic/config-3.18
@@ -2729,7 +2729,7 @@ CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PANEL is not set
# CONFIG_PANIC_ON_OOPS is not set
CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
+CONFIG_PANIC_TIMEOUT=1
# CONFIG_PANTHERLORD_FF is not set
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_1284 is not set
diff --git a/target/linux/generic/config-4.1 b/target/linux/generic/config-4.1
index 0ba5381dd0..b3d1ca3269 100644
--- a/target/linux/generic/config-4.1
+++ b/target/linux/generic/config-4.1
@@ -2831,7 +2831,7 @@ CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PANEL is not set
# CONFIG_PANIC_ON_OOPS is not set
CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
+CONFIG_PANIC_TIMEOUT=1
# CONFIG_PANTHERLORD_FF is not set
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_1284 is not set
diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4
index dbbf7fb88c..73f77a496a 100644
--- a/target/linux/generic/config-4.4
+++ b/target/linux/generic/config-4.4
@@ -2802,7 +2802,7 @@ CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PANEL is not set
# CONFIG_PANIC_ON_OOPS is not set
CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
+CONFIG_PANIC_TIMEOUT=1
# CONFIG_PANTHERLORD_FF is not set
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_1284 is not set