Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest: (45 commits)
  Use "struct boot_params" in example launcher
  Loading bzImage directly.
  Revert lguest magic and use hook in head.S
  Update lguest documentation to reflect the new virtual block device name.
  generalize lgread_u32/lgwrite_u32.
  Example launcher handle guests not being ready for input
  Update example launcher for virtio
  Lguest support for Virtio
  Remove old lguest I/O infrrasructure.
  Remove old lguest bus and drivers.
  Virtio helper routines for a descriptor ringbuffer implementation
  Module autoprobing support for virtio drivers.
  Virtio console driver
  Block driver using virtio.
  Net driver using virtio
  Virtio interface
  Boot with virtual == physical to get closer to native Linux.
  Allow guest to specify syscall vector to use.
  Rename "cr3" to "gpgdir" to avoid x86-specific naming.
  Pagetables to use normal kernel types
  ...

1 files changed, 46 insertions, 35 deletions

diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
index ba81ffe9958a..827b85bbf388 100644
--- a/include/linux/screen_info.h
+++ b/include/linux/screen_info.h
@@ -8,45 +8,43 @@
  */
 
 struct screen_info {
-        u8  orig_x;             /* 0x00 */
-        u8  orig_y;             /* 0x01 */
-        u16 ext_mem_k;          /* 0x02 */
-        u16 orig_video_page;    /* 0x04 */
-        u8  orig_video_mode;    /* 0x06 */
-        u8  orig_video_cols;    /* 0x07 */
-        u16 unused2;            /* 0x08 */
-        u16 orig_video_ega_bx;  /* 0x0a */
-        u16 unused3;            /* 0x0c */
-        u8  orig_video_lines;   /* 0x0e */
-        u8  orig_video_isVGA;   /* 0x0f */
-        u16 orig_video_points;  /* 0x10 */
+        __u8  orig_x;           /* 0x00 */
+        __u8  orig_y;           /* 0x01 */
+        __u16 ext_mem_k;        /* 0x02 */
+        __u16 orig_video_page;  /* 0x04 */
+        __u8  orig_video_mode;  /* 0x06 */
+        __u8  orig_video_cols;  /* 0x07 */
+        __u16 unused2;          /* 0x08 */
+        __u16 orig_video_ega_bx;/* 0x0a */
+        __u16 unused3;          /* 0x0c */
+        __u8  orig_video_lines; /* 0x0e */
+        __u8  orig_video_isVGA; /* 0x0f */
+        __u16 orig_video_points;/* 0x10 */
 
         /* VESA graphic mode -- linear frame buffer */
-        u16 lfb_width;          /* 0x12 */
-        u16 lfb_height;         /* 0x14 */
-        u16 lfb_depth;          /* 0x16 */
-        u32 lfb_base;           /* 0x18 */
-        u32 lfb_size;           /* 0x1c */
-        u16 cl_magic, cl_offset; /* 0x20 */
-        u16 lfb_linelength;     /* 0x24 */
-        u8  red_size;           /* 0x26 */
-        u8  red_pos;            /* 0x27 */
-        u8  green_size;         /* 0x28 */
-        u8  green_pos;          /* 0x29 */
-        u8  blue_size;          /* 0x2a */
-        u8  blue_pos;           /* 0x2b */
-        u8  rsvd_size;          /* 0x2c */
-        u8  rsvd_pos;           /* 0x2d */
-        u16 vesapm_seg;         /* 0x2e */
-        u16 vesapm_off;         /* 0x30 */
-        u16 pages;              /* 0x32 */
-        u16 vesa_attributes;    /* 0x34 */
-        u32 capabilities;       /* 0x36 */
-        u8  _reserved[6];       /* 0x3a */
+        __u16 lfb_width;        /* 0x12 */
+        __u16 lfb_height;       /* 0x14 */
+        __u16 lfb_depth;        /* 0x16 */
+        __u32 lfb_base;         /* 0x18 */
+        __u32 lfb_size;         /* 0x1c */
+        __u16 cl_magic, cl_offset; /* 0x20 */
+        __u16 lfb_linelength;   /* 0x24 */
+        __u8  red_size;         /* 0x26 */
+        __u8  red_pos;          /* 0x27 */
+        __u8  green_size;       /* 0x28 */
+        __u8  green_pos;        /* 0x29 */
+        __u8  blue_size;        /* 0x2a */
+        __u8  blue_pos;         /* 0x2b */
+        __u8  rsvd_size;        /* 0x2c */
+        __u8  rsvd_pos;         /* 0x2d */
+        __u16 vesapm_seg;       /* 0x2e */
+        __u16 vesapm_off;       /* 0x30 */
+        __u16 pages;            /* 0x32 */
+        __u16 vesa_attributes;  /* 0x34 */
+        __u32 capabilities;     /* 0x36 */
+        __u8  _reserved[6];     /* 0x3a */
 } __attribute__((packed));
 
-extern struct screen_info screen_info;
-
 #define VIDEO_TYPE_MDA          0x10    /* Monochrome Text Display      */
 #define VIDEO_TYPE_CGA          0x11    /* CGA Display                  */
 #define VIDEO_TYPE_EGAM         0x20    /* EGA/VGA in Monochrome Mode   */
@@ -65,4 +63,17 @@ extern struct screen_info screen_info;
 
 #define VIDEO_TYPE_PMAC         0x60    /* PowerMacintosh frame buffer. */
 
+#ifdef __KERNEL__
+extern struct screen_info screen_info;
+
+#define ORIG_X                  (screen_info.orig_x)
+#define ORIG_Y                  (screen_info.orig_y)
+#define ORIG_VIDEO_MODE         (screen_info.orig_video_mode)
+#define ORIG_VIDEO_COLS         (screen_info.orig_video_cols)
+#define ORIG_VIDEO_EGA_BX       (screen_info.orig_video_ega_bx)
+#define ORIG_VIDEO_LINES        (screen_info.orig_video_lines)
+#define ORIG_VIDEO_ISVGA        (screen_info.orig_video_isVGA)
+#define ORIG_VIDEO_POINTS       (screen_info.orig_video_points)
+#endif /* __KERNEL__ */
+
 #endif /* _SCREEN_INFO_H */