diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 12:00:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 12:00:10 -0700 |
| commit | 26a5c0dfbc9c4b1c455821c0a0ea6d6116082397 (patch) | |
| tree | b63fde090696e2be3224e15ab6c9d4245f349d3f /Documentation | |
| parent | 54cad6270a30edc75276c653ccb81dc313f0fcde (diff) | |
| parent | b82ad3d3944193e5f95319c30fd24e39d0d7b510 (diff) | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"Various smaller cleanups"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, pageattr: Correct WBINVD spelling in comment
x86, crash: Unify ifdef
x86, boot: Correct max ramdisk size name
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/x86/boot.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index cb81741d3b0b..a75e3adaa39d 100644 --- a/Documentation/x86/boot.txt +++ b/Documentation/x86/boot.txt @@ -182,7 +182,7 @@ Offset Proto Name Meaning 0226/1 2.02+(3 ext_loader_ver Extended boot loader version 0227/1 2.02+(3 ext_loader_type Extended boot loader ID 0228/4 2.02+ cmd_line_ptr 32-bit pointer to the kernel command line -022C/4 2.03+ ramdisk_max Highest legal initrd address +022C/4 2.03+ initrd_addr_max Highest legal initrd address 0230/4 2.05+ kernel_alignment Physical addr alignment required for kernel 0234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not 0235/1 2.10+ min_alignment Minimum alignment, as a power of two @@ -534,7 +534,7 @@ Protocol: 2.02+ zero, the kernel will assume that your boot loader does not support the 2.02+ protocol. -Field name: ramdisk_max +Field name: initrd_addr_max Type: read Offset/size: 0x22c/4 Protocol: 2.03+ |