From: Jeremy Fitzhardinge Date: Wed, 13 Sep 2006 03:35:57 +0000 (-0700) Subject: [PATCH] x86: reserve a boot-loader ID number for Xen X-Git-Tag: v2.6.18~13^2~17 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=354332ee44834819ff31a0afbeffda0c32244f8f;p=linux-2.6 [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 Acked-by: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/Documentation/i386/boot.txt b/Documentation/i386/boot.txt index 10312bebe5..c51314b1a4 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 if you need a bootloader ID value assigned. diff --git a/Documentation/i386/zero-page.txt b/Documentation/i386/zero-page.txt index df28c74167..c04a421f4a 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)