aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2014-03-12 10:13:02 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2014-03-13 18:32:42 -0400
commit3e920b532a0f49d05e4c0f7d1b46b0ab8f471e09 (patch)
tree09b344d28adc46c900235c9a8da3fcdabd7c3200
parentfa389e220254c69ffae0d403eac4146171062d08 (diff)
x86, boot: Correct max ramdisk size name
The name in struct bootparam is ->initrd_addr_max and not ramdisk_max. Fix that. Signed-off-by: Borislav Petkov <bp@suse.de> Link: http://lkml.kernel.org/r/1394633584-5509-2-git-send-email-bp@alien8.de Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--Documentation/x86/boot.txt4
-rw-r--r--arch/x86/boot/header.S2
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
1820226/1 2.02+(3 ext_loader_ver Extended boot loader version 1820226/1 2.02+(3 ext_loader_ver Extended boot loader version
1830227/1 2.02+(3 ext_loader_type Extended boot loader ID 1830227/1 2.02+(3 ext_loader_type Extended boot loader ID
1840228/4 2.02+ cmd_line_ptr 32-bit pointer to the kernel command line 1840228/4 2.02+ cmd_line_ptr 32-bit pointer to the kernel command line
185022C/4 2.03+ ramdisk_max Highest legal initrd address 185022C/4 2.03+ initrd_addr_max Highest legal initrd address
1860230/4 2.05+ kernel_alignment Physical addr alignment required for kernel 1860230/4 2.05+ kernel_alignment Physical addr alignment required for kernel
1870234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not 1870234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not
1880235/1 2.10+ min_alignment Minimum alignment, as a power of two 1880235/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
537Field name: ramdisk_max 537Field name: initrd_addr_max
538Type: read 538Type: read
539Offset/size: 0x22c/4 539Offset/size: 0x22c/4
540Protocol: 2.03+ 540Protocol: 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
353ramdisk_max: .long 0x7fffffff 353initrd_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