diff options
| author | Vivek Goyal <vgoyal@in.ibm.com> | 2006-12-07 02:14:13 +0100 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-07 02:14:13 +0100 |
| commit | d263b213577a1e8f166b0a7212d85175e36d6c19 (patch) | |
| tree | ebd5221bdebe0f222a8fea2f91e71977a0e270f6 /Documentation | |
| parent | [PATCH] x86-64: replace kmalloc+memset with kzalloc in MTRR code (diff) | |
| download | linux-d263b213577a1e8f166b0a7212d85175e36d6c19.tar.xz linux-d263b213577a1e8f166b0a7212d85175e36d6c19.zip | |
[PATCH] x86-64: Correct documentation for bzImage protocol v2.05
Correct the documentation for bzImage protocol extension due to relocatable
bzImage.
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Acked-by: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/i386/boot.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/i386/boot.txt b/Documentation/i386/boot.txt index cb28254f1550..9575de300a61 100644 --- a/Documentation/i386/boot.txt +++ b/Documentation/i386/boot.txt @@ -2,7 +2,7 @@ ---------------------------- 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 convention. This has evolved partially due to historical aspects, as @@ -131,8 +131,8 @@ Offset Proto Name Meaning 0226/2 N/A pad1 Unused 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 -0230/4 2.04+ kernel_alignment Physical addr alignment required for kernel -0234/1 2.04+ relocatable_kernel Whether kernel is relocatable or not +0230/4 2.05+ kernel_alignment Physical addr alignment required for kernel +0234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not (1) For backwards compatibility, if the setup_sects field contains 0, the real value is 4. |