[Xen-changelog] [linux-2.6.18-xen] merge with linux-2.6.18-xen.hg

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1186951832 21600
# Node ID 8dd0c593a5a214ac1494ad53afee73aa2fed817a
# Parent  26a45a66dedeac2f53e49b62ef18e3974ec56437
# Parent  840b9df48b6a4f0f569963dba01885bde2946b6b
merge with linux-2.6.18-xen.hg
---
 arch/i386/mm/fault-xen.c      |    5 +----
 drivers/xen/console/console.c |   12 +++---------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff -r 26a45a66dede -r 8dd0c593a5a2 arch/i386/mm/fault-xen.c
--- a/arch/i386/mm/fault-xen.c  Sun Aug 12 12:09:27 2007 -0600
+++ b/arch/i386/mm/fault-xen.c  Sun Aug 12 14:50:32 2007 -0600
@@ -756,10 +756,7 @@ void vmalloc_sync_all(void)
                        struct page *page;
 
                        spin_lock_irqsave(&pgd_lock, flags);
-                       /*
-                        * XEN: vmalloc_sync_one() failure path logic assumes
-                        * pgd_list is non-empty.
-                        */
+                       /* XEN: failure path assumes non-empty pgd_list. */
                        if (unlikely(!pgd_list)) {
                                spin_unlock_irqrestore(&pgd_lock, flags);
                                return;
diff -r 26a45a66dede -r 8dd0c593a5a2 drivers/xen/console/console.c
--- a/drivers/xen/console/console.c     Sun Aug 12 12:09:27 2007 -0600
+++ b/drivers/xen/console/console.c     Sun Aug 12 14:50:32 2007 -0600
@@ -66,14 +66,14 @@
  *  'xencons=tty'  [XC_TTY]:     Console attached to '/dev/tty[0-9]+'.
  *  'xencons=ttyS' [XC_SERIAL]:  Console attached to '/dev/ttyS[0-9]+'.
  *  'xencons=xvc'  [XC_XVC]:     Console attached to '/dev/xvc0'.
- *  default:                     DOM0 -> XC_SERIAL ; all others -> XC_TTY.
+ *  default:                     XC_XVC
  * 
  * NB. In mode XC_TTY, we create dummy consoles for tty2-63. This suppresses
  * warnings from standard distro startup scripts.
  */
 static enum {
        XC_OFF, XC_TTY, XC_SERIAL, XC_XVC
-} xc_mode;
+} xc_mode = XC_XVC;
 static int xc_num = -1;
 
 /* /dev/xvc0 device number allocated by lanana.org. */
@@ -88,13 +88,7 @@ void xencons_early_setup(void)
 void xencons_early_setup(void)
 {
        extern int console_use_vt;
-
-       if (is_initial_xendomain()) {
-               xc_mode = XC_SERIAL;
-       } else {
-               xc_mode = XC_TTY;
-               console_use_vt = 0;
-       }
+       console_use_vt = 0;
 }
 
 static int __init xencons_setup(char *str)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog