xserver: Branch 'master' - 2 commits

[Adam Jackson]

 hw/xfree86/common/xf86Init.c |    2 +-
 os/utils.c                   |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c3897ca7099fc007b4134a8fabd4c707f99f2ac7
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Nov 9 13:55:32 2007 -0500

    Add -pogo option for init/teardown performance testing.

diff --git a/os/utils.c b/os/utils.c
index ae96a41..d46a756 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -933,6 +933,10 @@ ProcessCommandLine(int argc, char *argv[])
 	    else
 		UseMsg();
 	}
+	else if (strcmp(argv[i], "-pogo") == 0)
+	{
+	    dispatchException = DE_TERMINATE;
+	}
 	else if ( strcmp( argv[i], "-pn") == 0)
 	    PartialNetwork = TRUE;
 	else if ( strcmp( argv[i], "-nopn") == 0)
commit cecac794451b793871f297b91a11d3b52eeb6d1b
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Nov 8 17:25:36 2007 -0500

    Don't sleep(1) at server exit.

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index bf577e6..d4f01d3 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1307,7 +1307,7 @@ AbortDDX()
   /*
    * try to restore the original video state
    */
-#ifdef HAS_USL_VTS
+#if defined(HAS_USL_VTS) && !defined(linux)
   /* Need the sleep when starting X from within another X session */
   sleep(1);
 #endif