Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d404ab0a1133e95557bb7deab2a49b348dfeba85

Authored by Olaf Hering
Committed by Linus Torvalds
1 parent b259514282
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

move x86 specific oops=panic to generic code 

The oops=panic cmdline option is not x86 specific, move it to generic code.
Update documentation.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 4 changed files with 15 additions and 15 deletions Side-by-side Diff

Documentation/kernel-parameters.txt
Diff comments   View file @ d404ab0
... ... @@ -1825,6 +1825,11 @@
1825 1825 perfmon on Intel CPUs instead of the
1826 1826 CPU specific event set.
1827 1827  
  1828 + oops=panic Always panic on oopses. Default is to just kill the process,
  1829 + but there is a small probability of deadlocking the machine.
  1830 + This will also cause panics on machine check exceptions.
  1831 + Useful together with panic=30 to trigger a reboot.
  1832 +
1828 1833 OSS [HW,OSS]
1829 1834 See Documentation/sound/oss/oss-parameters.txt
1830 1835  
Documentation/x86/x86_64/boot-options.txt
Diff comments   View file @ d404ab0
... ... @@ -293,11 +293,6 @@
293 293  
294 294 Debugging
295 295  
296   - oops=panic Always panic on oopses. Default is to just kill the process,
297   - but there is a small probability of deadlocking the machine.
298   - This will also cause panics on machine check exceptions.
299   - Useful together with panic=30 to trigger a reboot.
300   -
301 296 kstack=N Print N words from the kernel stack in oops dumps.
302 297  
303 298 pagefaulttrace Dump all page faults. Only useful for extreme debugging
arch/x86/kernel/dumpstack.c
Diff comments   View file @ d404ab0
... ... @@ -322,16 +322,6 @@
322 322 oops_end(flags, regs, sig);
323 323 }
324 324  
325   -static int __init oops_setup(char *s)
326   -{
327   - if (!s)
328   - return -EINVAL;
329   - if (!strcmp(s, "panic"))
330   - panic_on_oops = 1;
331   - return 0;
332   -}
333   -early_param("oops", oops_setup);
334   -
335 325 static int __init kstack_setup(char *s)
336 326 {
337 327 if (!s)
... ... @@ -433,4 +433,14 @@
433 433  
434 434 core_param(panic, panic_timeout, int, 0644);
435 435 core_param(pause_on_oops, pause_on_oops, int, 0644);
  436 +
  437 +static int __init oops_setup(char *s)
  438 +{
  439 + if (!s)
  440 + return -EINVAL;
  441 + if (!strcmp(s, "panic"))
  442 + panic_on_oops = 1;
  443 + return 0;
  444 +}
  445 +early_param("oops", oops_setup);