update

[l4.git] / l4 / pkg / linux-26-headers / include / asm-x86 / bootparam.h

diff --git a/l4/pkg/linux-26-headers/include/asm-x86/bootparam.h b/l4/pkg/linux-26-headers/include/asm-x86/bootparam.h
index 08744242b8d24c9111d2275ff6d84752d725584e..225b0988043a0a78ac9092a9af7a265122c685cd 100644 (file)
--- a/l4/pkg/linux-26-headers/include/asm-x86/bootparam.h
+++ b/l4/pkg/linux-26-headers/include/asm-x86/bootparam.h
@@ -6,7 +6,7 @@
 #define SETUP_E820_EXT                 1
 #define SETUP_DTB                      2
 #define SETUP_PCI                      3
-#define SETUP_EFI_VARS                 4
+#define SETUP_EFI                      4
 
 /* ram_size flags */
 #define RAMDISK_IMAGE_START_MASK       0x07FF
@@ -24,6 +24,7 @@
 #define XLF_CAN_BE_LOADED_ABOVE_4G     (1<<1)
 #define XLF_EFI_HANDOVER_32            (1<<2)
 #define XLF_EFI_HANDOVER_64            (1<<3)
+#define XLF_EFI_KEXEC                  (1<<4)
 
 #ifndef __ASSEMBLY__
 
@@ -159,7 +160,7 @@ enum {
        X86_SUBARCH_PC = 0,
        X86_SUBARCH_LGUEST,
        X86_SUBARCH_XEN,
-       X86_SUBARCH_MRST,
+       X86_SUBARCH_INTEL_MID,
        X86_SUBARCH_CE4100,
        X86_NR_SUBARCHS,
 };