From e74cecb9617183cf7d35f09edd143bf6ca779afa Mon Sep 17 00:00:00 2001 From: Vivek Goyal Date: Thu, 7 Dec 2006 02:14:13 +0100 Subject: [PATCH] --- yaml --- r: 43134 b: refs/heads/master c: d263b213577a1e8f166b0a7212d85175e36d6c19 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/i386/boot.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6001194e6d82..a3bf4d2446ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cfa5b5dfafcfe64c1a48906f243cdd302f82471 +refs/heads/master: d263b213577a1e8f166b0a7212d85175e36d6c19 diff --git a/trunk/Documentation/i386/boot.txt b/trunk/Documentation/i386/boot.txt index cb28254f1550..9575de300a61 100644 --- a/trunk/Documentation/i386/boot.txt +++ b/trunk/Documentation/i386/boot.txt @@ -2,7 +2,7 @@ ---------------------------- H. Peter Anvin - 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.