Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d404ab0a authored by Olaf Hering's avatar Olaf Hering Committed by Linus Torvalds
Browse files

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: default avatarOlaf 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b2595142

Documentation/kernel-parameters.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -1825,6 +1825,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
				perfmon on Intel CPUs instead of the

				perfmon on Intel CPUs instead of the

				CPU specific event set.

				CPU specific event set.





	oops=panic	Always panic on oopses. Default is to just kill the process,

			but there is a small probability of deadlocking the machine.

			This will also cause panics on machine check exceptions.

			Useful together with panic=30 to trigger a reboot.



	OSS		[HW,OSS]

	OSS		[HW,OSS]

			See Documentation/sound/oss/oss-parameters.txt

			See Documentation/sound/oss/oss-parameters.txt

Documentation/x86/x86_64/boot-options.txt

+0 −5
Original line number Original line Diff line number Diff line
@@ -293,11 +293,6 @@ IOMMU (input/output memory management unit) 




Debugging

Debugging





  oops=panic	Always panic on oopses. Default is to just kill the process,

		but there is a small probability of deadlocking the machine.

		This will also cause panics on machine check exceptions.

		Useful together with panic=30 to trigger a reboot.



  kstack=N	Print N words from the kernel stack in oops dumps.

  kstack=N	Print N words from the kernel stack in oops dumps.





  pagefaulttrace  Dump all page faults. Only useful for extreme debugging

  pagefaulttrace  Dump all page faults. Only useful for extreme debugging

arch/x86/kernel/dumpstack.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -322,16 +322,6 @@ void die(const char *str, struct pt_regs *regs, long err) 
	oops_end(flags, regs, sig);

	oops_end(flags, regs, sig);

}

}





static int __init oops_setup(char *s)

{

	if (!s)

		return -EINVAL;

	if (!strcmp(s, "panic"))

		panic_on_oops = 1;

	return 0;

}

early_param("oops", oops_setup);



static int __init kstack_setup(char *s)

static int __init kstack_setup(char *s)

{

{

	if (!s)

	if (!s)

kernel/panic.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -433,3 +433,13 @@ EXPORT_SYMBOL(__stack_chk_fail); 




core_param(panic, panic_timeout, int, 0644);

core_param(panic, panic_timeout, int, 0644);

core_param(pause_on_oops, pause_on_oops, int, 0644);

core_param(pause_on_oops, pause_on_oops, int, 0644);



static int __init oops_setup(char *s)

{

	if (!s)

		return -EINVAL;

	if (!strcmp(s, "panic"))

		panic_on_oops = 1;

	return 0;

}

early_param("oops", oops_setup);