Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e920b53 authored Mar 12, 2014 by Borislav Petkov Committed by H. Peter Anvin Mar 13, 2014

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>

parent fa389e22

Documentation/x86/boot.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -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+

arch/x86/boot/header.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -350,7 +350,7 @@ cmd_line_ptr: .long 0 # (Header version 0x0202 or later)
		# can be located anywhere in
		# low memory 0x10000 or higher.

		ramdisk_max: .long 0x7fffffff
		initrd_addr_max: .long 0x7fffffff
		# (Header version 0x0203 or later)
		# The highest safe address for
		# the contents of an initrd