x86: nmi - add sensible names to nmi_watchdog boot param

Add sensible names as "lapic" and "ioapic" to nmi_watchdog boot parameter. Sometimes it is not that easy to recall what exactly nmi_watchdog=1 does mean so we allow the using of symbolic names here.

Old numeric values remain valid.

---

 arch/x86/kernel/nmi.c |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Index: linux-2.6.git/arch/x86/kernel/nmi.c
===================================================================
@@ -208,12 +208,17 @@ static int __init setup_nmi_watchdog(cha
 		++str;
 	}
 
-	get_option(&str, &nmi);
-
-	if (nmi >= NMI_INVALID)
-		return 0;
+	if (!strncmp(str, "lapic", 5))
+		nmi_watchdog = NMI_LOCAL_APIC;
+	else if (!strncmp(str, "ioapic", 6))
+		nmi_watchdog = NMI_IO_APIC;
+	else {
+		get_option(&str, &nmi);
+		if (nmi >= NMI_INVALID)
+			return 0;
+		nmi_watchdog = nmi;
+	}
 
-	nmi_watchdog = nmi;
 	return 1;
 }
 __setup("nmi_watchdog=", setup_nmi_watchdog);

looks good to me, but you need to update the documentation as well.

Aristeu

[Aristeu Rozanski - Thu, Oct 30, 2008 at 01:10:53PM -0400]

| > Add sensible names as "lapic" and "ioapic" to
| > nmi_watchdog boot parameter. Sometimes it is not
| > that easy to recall what exactly nmi_watchdog=1
| > does mean so we allow the using of symbolic names here.
| > 
| > Old numeric values remain valid.
| looks good to me, but you need to update the documentation as well.
| 
| -- 
| Aristeu
| 

Aristeu, maybe you could do it for me -- English is quite weak side of me :)

- Cyrill -

[Cyrill Gorcunov - Thu, Oct 30, 2008 at 08:14:26PM +0300]

| [Aristeu Rozanski - Thu, Oct 30, 2008 at 01:10:53PM -0400]
| | > Add sensible names as "lapic" and "ioapic" to
| | > nmi_watchdog boot parameter. Sometimes it is not
| | > that easy to recall what exactly nmi_watchdog=1
| | > does mean so we allow the using of symbolic names here.
| | > 
| | > Old numeric values remain valid.
| | looks good to me, but you need to update the documentation as well.
| | 
| | -- 
| | Aristeu
| | 
| 
| Aristeu, maybe you could do it for me -- English is quite weak
| side of me :)
| 
| 		- Cyrill -

I think I'd better wait 'till your patch (for nmi_watchdog.txt) applied. It allows me to just write a few words so it would be pushed on top of _all_ nmi related changes these days (without interdiff).

- Cyrill -

ok, that makes quite a bit of sense. Peter, any objections?

Ingo