[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>

diff --git a/Documentation/i386/boot.txt b/Documentation/i386/boot.txt
index 10312bebe55de0b063e59b28f2781a7f7001f8b4..c51314b1a463a35eb222d550409d0a29137149e2 100644 (file)
--- 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 df28c7416781ff664a542e780006279b542d64c8..c04a421f4a7c70290aaf6d6f4eb54af701fd2ae6 100644 (file)
--- 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)