Yinghai Lu wrote:
quoted text
> On Fri, Oct 31, 2008 at 12:23 PM, Cyrill Gorcunov <gorcunov@gmail.com> wrote:
>> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
>> ---
>>
>> 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

--
unsubscribe notice
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/