summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2006-09-12 20:35:57 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-13 07:32:14 -0700
commit354332ee44834819ff31a0afbeffda0c32244f8f (patch)
treed2ebd322ed731164dae55157528ad6b6672d6160 /Documentation
parentdd9daa221e77f642954849a795fa7c59533a9b2f (diff)
downloadlinux-354332ee44834819ff31a0afbeffda0c32244f8f.tar.gz
linux-354332ee44834819ff31a0afbeffda0c32244f8f.tar.bz2
linux-354332ee44834819ff31a0afbeffda0c32244f8f.zip
[PATCH] x86: reserve a boot-loader ID number for Xen
Claim an ID number for Xen in the LOADER_TYPE field. Also, keep the table in zero-page.txt consistent with boot.txt. [hpa says: 6 was skipped because I couldn't rule out that it hadn't been unofficially used. It seemed easier to skip it for now.] Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com> Acked-by: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/i386/boot.txt1
-rw-r--r--Documentation/i386/zero-page.txt4
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/i386/boot.txt b/Documentation/i386/boot.txt
index 10312bebe55d..c51314b1a463 100644
--- a/Documentation/i386/boot.txt
+++ b/Documentation/i386/boot.txt
@@ -181,6 +181,7 @@ filled out, however:
5 ELILO
7 GRuB
8 U-BOOT
+ 9 Xen
Please contact <hpa@zytor.com> if you need a bootloader ID
value assigned.
diff --git a/Documentation/i386/zero-page.txt b/Documentation/i386/zero-page.txt
index df28c7416781..c04a421f4a7c 100644
--- a/Documentation/i386/zero-page.txt
+++ b/Documentation/i386/zero-page.txt
@@ -63,6 +63,10 @@ Offset Type Description
2 for bootsect-loader
3 for SYSLINUX
4 for ETHERBOOT
+ 5 for ELILO
+ 7 for GRuB
+ 8 for U-BOOT
+ 9 for Xen
V = version
0x211 char loadflags:
bit0 = 1: kernel is loaded high (bzImage)