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

Commit 5b9a0e14 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: nmi - nmi_watchdog boot param docs cleanup 



Impact: documentation update

1) nmi_watchdog boot parameter is common to 32/64 bit modes. So
   move it from Documentation/x86/x86_64/boot-options.txt to
   Documentation/kernel-parameters.txt and integrate with.

2) Also fix [panic] keyword placement -- it ought to be at first
   position otherwise it will not be recognized.

3) Document lapic and ioapic keywords.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8a1c8eb7

Documentation/kernel-parameters.txt

+14 −1
Original line number Diff line number Diff line
@@ -1403,7 +1403,20 @@ and is between 256 and 4096 characters. It is defined in the file 
			when a NMI is triggered.

			Format: [state][,regs][,debounce][,die]



	nmi_watchdog=	[KNL,BUGS=X86-32] Debugging features for SMP kernels

	nmi_watchdog=	[KNL,BUGS=X86-32,X86-64] Debugging features for SMP kernels

			Format: [panic,][num]

			Valid num: 0,1,2

			0 - turn nmi_watchdog off

			1 - use the IO-APIC timer for the NMI watchdog

			2 - use the local APIC for the NMI watchdog using

			a performance counter. Note: This will use one performance

			counter and the local APIC's performance vector.

			When panic is specified panic when an NMI watchdog timeout occurs.

			This is useful when you use a panic=... timeout and need the box

			quickly up again.

			Instead of 1 and 2 it is possible to use the following

			symbolic names: lapic and ioapic

			Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic



	no387		[BUGS=X86-32] Tells the kernel to use the 387 maths

			emulation library even if a 387 maths coprocessor

Documentation/x86/x86_64/boot-options.txt

+0 −11
Original line number Diff line number Diff line
@@ -79,17 +79,6 @@ Timing 
  Report when timer interrupts are lost because some code turned off

  interrupts for too long.



  nmi_watchdog=NUMBER[,panic]

  NUMBER can be:

  0 don't use an NMI watchdog

  1 use the IO-APIC timer for the NMI watchdog

  2 use the local APIC for the NMI watchdog using a performance counter. Note

  This will use one performance counter and the local APIC's performance

  vector.

  When panic is specified panic when an NMI watchdog timeout occurs.

  This is useful when you use a panic=... timeout and need the box

  quickly up again.



  nohpet

  Don't use the HPET timer.