diff options
| author | Vivek Goyal <vgoyal@in.ibm.com> | 2006-12-06 20:14:13 -0500 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-06 20:14:13 -0500 |
| commit | d263b213577a1e8f166b0a7212d85175e36d6c19 (patch) | |
| tree | ebd5221bdebe0f222a8fea2f91e71977a0e270f6 /Documentation | |
| parent | 9cfa5b5dfafcfe64c1a48906f243cdd302f82471 (diff) | |
[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 @@ | |||
| 2 | ---------------------------- | 2 | ---------------------------- |
| 3 | 3 | ||
| 4 | H. Peter Anvin <hpa@zytor.com> | 4 | H. Peter Anvin <hpa@zytor.com> |
| 5 | Last update 2005-09-02 | 5 | Last update 2006-11-17 |
| 6 | 6 | ||
| 7 | On the i386 platform, the Linux kernel uses a rather complicated boot | 7 | On the i386 platform, the Linux kernel uses a rather complicated boot |
| 8 | convention. This has evolved partially due to historical aspects, as | 8 | convention. This has evolved partially due to historical aspects, as |
| @@ -131,8 +131,8 @@ Offset Proto Name Meaning | |||
| 131 | 0226/2 N/A pad1 Unused | 131 | 0226/2 N/A pad1 Unused |
| 132 | 0228/4 2.02+ cmd_line_ptr 32-bit pointer to the kernel command line | 132 | 0228/4 2.02+ cmd_line_ptr 32-bit pointer to the kernel command line |
| 133 | 022C/4 2.03+ initrd_addr_max Highest legal initrd address | 133 | 022C/4 2.03+ initrd_addr_max Highest legal initrd address |
| 134 | 0230/4 2.04+ kernel_alignment Physical addr alignment required for kernel | 134 | 0230/4 2.05+ kernel_alignment Physical addr alignment required for kernel |
| 135 | 0234/1 2.04+ relocatable_kernel Whether kernel is relocatable or not | 135 | 0234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not |
| 136 | 136 | ||
| 137 | (1) For backwards compatibility, if the setup_sects field contains 0, the | 137 | (1) For backwards compatibility, if the setup_sects field contains 0, the |
| 138 | real value is 4. | 138 | real value is 4. |