diff options
-rw-r--r-- | Documentation/x86/boot.txt | 4 | ||||
-rw-r--r-- | arch/x86/boot/header.S | 2 |
2 files changed, 3 insertions, 3 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 | |||
182 | 0226/1 2.02+(3 ext_loader_ver Extended boot loader version | 182 | 0226/1 2.02+(3 ext_loader_ver Extended boot loader version |
183 | 0227/1 2.02+(3 ext_loader_type Extended boot loader ID | 183 | 0227/1 2.02+(3 ext_loader_type Extended boot loader ID |
184 | 0228/4 2.02+ cmd_line_ptr 32-bit pointer to the kernel command line | 184 | 0228/4 2.02+ cmd_line_ptr 32-bit pointer to the kernel command line |
185 | 022C/4 2.03+ ramdisk_max Highest legal initrd address | 185 | 022C/4 2.03+ initrd_addr_max Highest legal initrd address |
186 | 0230/4 2.05+ kernel_alignment Physical addr alignment required for kernel | 186 | 0230/4 2.05+ kernel_alignment Physical addr alignment required for kernel |
187 | 0234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not | 187 | 0234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not |
188 | 0235/1 2.10+ min_alignment Minimum alignment, as a power of two | 188 | 0235/1 2.10+ min_alignment Minimum alignment, as a power of two |
@@ -534,7 +534,7 @@ Protocol: 2.02+ | |||
534 | zero, the kernel will assume that your boot loader does not support | 534 | zero, the kernel will assume that your boot loader does not support |
535 | the 2.02+ protocol. | 535 | the 2.02+ protocol. |
536 | 536 | ||
537 | Field name: ramdisk_max | 537 | Field name: initrd_addr_max |
538 | Type: read | 538 | Type: read |
539 | Offset/size: 0x22c/4 | 539 | Offset/size: 0x22c/4 |
540 | Protocol: 2.03+ | 540 | Protocol: 2.03+ |
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index ec3b8ba68096..46f5a220b0ad 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S | |||
@@ -350,7 +350,7 @@ cmd_line_ptr: .long 0 # (Header version 0x0202 or later) | |||
350 | # can be located anywhere in | 350 | # can be located anywhere in |
351 | # low memory 0x10000 or higher. | 351 | # low memory 0x10000 or higher. |
352 | 352 | ||
353 | ramdisk_max: .long 0x7fffffff | 353 | initrd_addr_max: .long 0x7fffffff |
354 | # (Header version 0x0203 or later) | 354 | # (Header version 0x0203 or later) |
355 | # The highest safe address for | 355 | # The highest safe address for |
356 | # the contents of an initrd | 356 | # the contents of an initrd |