diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-18 15:37:27 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-18 15:37:27 +1000 |
| commit | 85e11dea0f44f898cf3a5a153ca6a63b33c4353b (patch) | |
| tree | d3f72f15abdcc4d35fcada6d595cc95d765e9e16 /Documentation | |
| parent | 114f8d42acdac5bd646f2bf92e0b61b26d4b1420 (diff) | |
| parent | 75309eb294cd225617172ba00c18e3294a996773 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 6 | ||||
| -rw-r--r-- | Documentation/x86/boot.txt | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 963fcd38eba9..c51ebd70b2ce 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -746,6 +746,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. cpuidle.off=1 [CPU_IDLE] disable the cpuidle sub-system + cpu_init_udelay=N + [X86] Delay for N microsec between assert and de-assert + of APIC INIT to start processors. This delay occurs + on every CPU online, such as boot, and resume from suspend. + Default: 10000 + cpcihp_generic= [HW,PCI] Generic port I/O CompactPCI driver Format: <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>] diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index 88b85899d309..69e139791868 100644 --- a/Documentation/x86/boot.txt +++ b/Documentation/x86/boot.txt @@ -406,7 +406,7 @@ Protocol: 2.00+ - If 0, the protected-mode code is loaded at 0x10000. - If 1, the protected-mode code is loaded at 0x100000. - Bit 1 (kernel internal): ALSR_FLAG + Bit 1 (kernel internal): KASLR_FLAG - Used internally by the compressed kernel to communicate KASLR status to kernel proper. If 1, KASLR enabled. |