Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / include / asm-x86 / bootparam.h

diff --git a/include/asm-x86/bootparam.h b/include/asm-x86/bootparam.h
index e865990..ae22bdf 100644 (file)
--- a/include/asm-x86/bootparam.h
+++ b/include/asm-x86/bootparam.h
@@ -11,13 +11,14 @@
 
 /* setup data types */
 #define SETUP_NONE                     0
+#define SETUP_E820_EXT                 1
 
 /* extensible setup data list node */
 struct setup_data {
-       u64 next;
-       u32 type;
-       u32 len;
-       u8 data[0];
+       __u64 next;
+       __u32 type;
+       __u32 len;
+       __u8 data[0];
 };
 
 struct setup_header {
@@ -40,6 +41,7 @@ struct setup_header {
        __u8    type_of_loader;
        __u8    loadflags;
 #define LOADED_HIGH    (1<<0)
+#define QUIET_FLAG     (1<<5)
 #define KEEP_SEGMENTS  (1<<6)
 #define CAN_USE_HEAP   (1<<7)
        __u16   setup_move_size;