Merge branch 'linus' into x86/urgent

[mirror_ubuntu-artful-kernel.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 600cdd72900c868a311e4d642b425612cd9202e1..90b3924071b6c35f69ece1feba26ae9f92c5ab37 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1620,6 +1620,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
        nowb            [ARM]
 
+       nox2apic        [X86-64,APIC] Do not enable x2APIC mode.
+
        nptcg=          [IA64] Override max number of concurrent global TLB
                        purges which is reported from either PAL_VM_SUMMARY or
                        SAL PALO.