xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86.h       |    1 
 hw/xfree86/common/xf86Helper.c |   48 ++++++++++++++++++++---------------------
 2 files changed, 24 insertions(+), 25 deletions(-)

New commits:
commit fc5e8dc4a24c2b5bed4e6b5d00670c4401ec92d9
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Mar 13 14:00:37 2009 -0400

    Unexport xf86SetPriority

diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 6614e43..eb0ef43 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -251,7 +251,6 @@ extern _X_EXPORT void xf86GetClocks(ScrnInfoPtr pScrn, int num,
 		   void (*BlankScreen)(ScrnInfoPtr, Bool),
 		   IOADDRESS vertsyncreg, int maskval,
 		   int knownclkindex, int knownclkvalue);
-extern _X_EXPORT void xf86SetPriority(Bool up);
 extern _X_EXPORT const char *xf86GetVisualName(int visual);
 extern _X_EXPORT int xf86GetVerbosity(void);
 extern _X_EXPORT Pix24Flags xf86GetPix24(void);
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 9aeba27..0db7717 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1959,6 +1959,30 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
     return numFound;
 }
 
+static void
+xf86SetPriority(Bool up)
+{
+    static int saved_nice;
+
+    if (up) {
+#ifdef HAS_SETPRIORITY
+	saved_nice = getpriority(PRIO_PROCESS, 0);
+	setpriority(PRIO_PROCESS, 0, -20);
+#endif
+#if defined(SYSV) || defined(SVR4) || defined(linux)
+	saved_nice = nice(0);
+	nice(-20 - saved_nice);
+#endif
+    } else {
+#ifdef HAS_SETPRIORITY
+	setpriority(PRIO_PROCESS, 0, saved_nice);
+#endif
+#if defined(SYSV) || defined(SVR4) || defined(linux)
+	nice(20 + saved_nice);
+#endif
+    }
+}
+
 /*
  * xf86GetClocks -- get the dot-clocks via a BIG BAD hack ...
  */
@@ -2053,30 +2077,6 @@ finish:
     (*ClockFunc)(pScrn, CLK_REG_RESTORE);
 }
 
-void
-xf86SetPriority(Bool up)
-{
-    static int saved_nice;
-
-    if (up) {
-#ifdef HAS_SETPRIORITY
-	saved_nice = getpriority(PRIO_PROCESS, 0);
-	setpriority(PRIO_PROCESS, 0, -20);
-#endif
-#if defined(SYSV) || defined(SVR4) || defined(linux)
-	saved_nice = nice(0);
-	nice(-20 - saved_nice);
-#endif
-    } else {
-#ifdef HAS_SETPRIORITY
-	setpriority(PRIO_PROCESS, 0, saved_nice);
-#endif
-#if defined(SYSV) || defined(SVR4) || defined(linux)
-	nice(20 + saved_nice);
-#endif
-    }
-}
-
 const char *
 xf86GetVisualName(int visual)
 {