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

Commit d263b213 authored by Vivek Goyal's avatar Vivek Goyal Committed by Andi Kleen
Browse files

[PATCH] x86-64: Correct documentation for bzImage protocol v2.05 



Correct the documentation for bzImage protocol extension due to relocatable
bzImage.

Signed-off-by: default avatarVivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Acked-by: default avatar"H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent 9cfa5b5d

Documentation/i386/boot.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
		     ----------------------------

		     ----------------------------





		    H. Peter Anvin <hpa@zytor.com>

		    H. Peter Anvin <hpa@zytor.com>

			Last update 2005-09-02

			Last update 2006-11-17





On the i386 platform, the Linux kernel uses a rather complicated boot

On the i386 platform, the Linux kernel uses a rather complicated boot

convention.  This has evolved partially due to historical aspects, as

convention.  This has evolved partially due to historical aspects, as
@@ -131,8 +131,8 @@ Offset Proto Name Meaning 
0226/2	N/A	pad1		Unused

0226/2	N/A	pad1		Unused

0228/4	2.02+	cmd_line_ptr	32-bit pointer to the kernel command line

0228/4	2.02+	cmd_line_ptr	32-bit pointer to the kernel command line

022C/4	2.03+	initrd_addr_max	Highest legal initrd address

022C/4	2.03+	initrd_addr_max	Highest legal initrd address

0230/4	2.04+	kernel_alignment Physical addr alignment required for kernel

0230/4	2.05+	kernel_alignment Physical addr alignment required for kernel

0234/1	2.04+	relocatable_kernel Whether kernel is relocatable or not

0234/1	2.05+	relocatable_kernel Whether kernel is relocatable or not





(1) For backwards compatibility, if the setup_sects field contains 0, the

(1) For backwards compatibility, if the setup_sects field contains 0, the

    real value is 4.

    real value is 4.