The patch titled
x86: reserve a boot-loader ID number for Xen
has been removed from the -mm tree. Its filename is
x86-reserve-a-boot-loader-id-number-for-xen.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: x86: reserve a boot-loader ID number for Xen
From: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
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@xxxxxxxxxxxxx>
Acked-by: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
Documentation/i386/boot.txt | 1 +
Documentation/i386/zero-page.txt | 4 ++++
2 files changed, 5 insertions(+)
diff -puN Documentation/i386/boot.txt~x86-reserve-a-boot-loader-id-number-for-xen Documentation/i386/boot.txt
--- a/Documentation/i386/boot.txt~x86-reserve-a-boot-loader-id-number-for-xen
+++ a/Documentation/i386/boot.txt
@@ -181,6 +181,7 @@ filled out, however:
5 ELILO
7 GRuB
8 U-BOOT
+ 9 Xen
Please contact <hpa@xxxxxxxxx> if you need a bootloader ID
value assigned.
diff -puN Documentation/i386/zero-page.txt~x86-reserve-a-boot-loader-id-number-for-xen Documentation/i386/zero-page.txt
--- a/Documentation/i386/zero-page.txt~x86-reserve-a-boot-loader-id-number-for-xen
+++ a/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)
_
Patches currently in -mm which might be from jeremy@xxxxxxxx are
origin.patch
git-cpufreq-sw_any_bug_dmi_table-can-be-used-on-resume.patch
x86-remaining-pda-patches.patch
x86-remove-default_ldt-and-simplify-ldt-setting.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
