Revert "kernel: panic.c: Set panic_timeoutu = 0; and panic_on_oops = 0;"
This reverts commit 5eecb1807a
.
This commit is contained in:
parent
d50c22bf50
commit
c09929ddba
1 changed files with 3 additions and 2 deletions
|
@ -52,7 +52,7 @@ static unsigned int __read_mostly sysctl_oops_all_cpu_backtrace;
|
||||||
#define sysctl_oops_all_cpu_backtrace 0
|
#define sysctl_oops_all_cpu_backtrace 0
|
||||||
#endif /* CONFIG_SMP */
|
#endif /* CONFIG_SMP */
|
||||||
|
|
||||||
int panic_on_oops = 0;
|
int panic_on_oops = CONFIG_PANIC_ON_OOPS_VALUE;
|
||||||
static unsigned long tainted_mask =
|
static unsigned long tainted_mask =
|
||||||
IS_ENABLED(CONFIG_GCC_PLUGIN_RANDSTRUCT) ? (1 << TAINT_RANDSTRUCT) : 0;
|
IS_ENABLED(CONFIG_GCC_PLUGIN_RANDSTRUCT) ? (1 << TAINT_RANDSTRUCT) : 0;
|
||||||
static int pause_on_oops;
|
static int pause_on_oops;
|
||||||
|
@ -64,7 +64,8 @@ unsigned long panic_on_taint;
|
||||||
bool panic_on_taint_nousertaint = false;
|
bool panic_on_taint_nousertaint = false;
|
||||||
static unsigned int warn_limit __read_mostly;
|
static unsigned int warn_limit __read_mostly;
|
||||||
|
|
||||||
int panic_timeout = 0;
|
int panic_timeout = CONFIG_PANIC_TIMEOUT;
|
||||||
|
EXPORT_SYMBOL_GPL(panic_timeout);
|
||||||
|
|
||||||
#define PANIC_PRINT_TASK_INFO 0x00000001
|
#define PANIC_PRINT_TASK_INFO 0x00000001
|
||||||
#define PANIC_PRINT_MEM_INFO 0x00000002
|
#define PANIC_PRINT_MEM_INFO 0x00000002
|
||||||
|
|
Loading…
Reference in a new issue