diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-30 07:57:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-30 07:57:04 +0200 |
| commit | dc5fb575df9cdd34ac12bf7a814c9beae0a7ca9b (patch) | |
| tree | cd2febb026bab11526f38b266a64f5086330d793 /Documentation/x86 | |
| parent | x86/fpu: Fix FPU related boot regression when CPUID masking BIOS feature is e... (diff) | |
| parent | x86/boot/setup: Clean up the e820_reserve_setup_data() code (diff) | |
| download | linux-dc5fb575df9cdd34ac12bf7a814c9beae0a7ca9b.tar.xz linux-dc5fb575df9cdd34ac12bf7a814c9beae0a7ca9b.zip | |
Merge branch 'x86/boot' into x86/urgent
Merge branch that got ready.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/x86')
| -rw-r--r-- | Documentation/x86/boot.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index 7c1f9fad6674..9da6f3512249 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. |