Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753307AbYJaVj5 (ORCPT ); Fri, 31 Oct 2008 17:39:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751856AbYJaVjs (ORCPT ); Fri, 31 Oct 2008 17:39:48 -0400 Received: from terminus.zytor.com ([198.137.202.10]:53612 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751574AbYJaVjs (ORCPT ); Fri, 31 Oct 2008 17:39:48 -0400 Message-ID: <490B7AFE.2030505@zytor.com> Date: Fri, 31 Oct 2008 14:39:10 -0700 From: "H. Peter Anvin" User-Agent: Thunderbird 2.0.0.14 (X11/20080501) MIME-Version: 1.0 To: Yinghai Lu CC: Cyrill Gorcunov , Ingo Molnar , "Maciej W. Rozycki" , Aristeu Rozanski , LKML , Thomas Gleixner Subject: Re: [PATCH] x86: nmi - document lapic and ioapic parameters References: <20081031192358.GC20803@localhost> <86802c440810311422w79d0e697k246cb5ca76bf91b5@mail.gmail.com> In-Reply-To: <86802c440810311422w79d0e697k246cb5ca76bf91b5@mail.gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1856 Lines: 44 Yinghai Lu wrote: > On Fri, Oct 31, 2008 at 12:23 PM, Cyrill Gorcunov wrote: >> Signed-off-by: Cyrill Gorcunov >> --- >> >> On top of -tip dda51106620c328b50007c259b9ef8cea2b7c3d2 >> >> Index: linux-2.6.git/Documentation/kernel-parameters.txt >> =================================================================== >> --- linux-2.6.git.orig/Documentation/kernel-parameters.txt 2008-10-27 21:35:08.000000000 +0300 >> +++ linux-2.6.git/Documentation/kernel-parameters.txt 2008-10-31 22:21:59.000000000 +0300 >> @@ -1404,6 +1404,14 @@ and is between 256 and 4096 characters. >> Format: [state][,regs][,debounce][,die] >> >> nmi_watchdog= [KNL,BUGS=X86-32] Debugging features for SMP kernels >> + Format: [panic,][num] >> + Valid num: 0,1,2 >> + 0 - turn nmi_watchdog off >> + 1 - use IO-APIC >> + 2 - use local APIC >> + 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 >> -- > > please update > > Documentation/x86/x86_64/boot-options.txt > If it's in x86-64, it's not =X86-32, so something is fishy. The x86_64/boot-options.txt file really should be merged into kernel-parameters.txt. -hpa -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/