From: Kamala Narasimhan <kamala.narasimhan@citrix.com>
Date: Tue, 19 May 2009 18:59:43 +0000 (-0400)
Subject: Fix another rc3 merge issue.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3795a7e82501d17ce8e6b213cdfd5dfdfb754dcc;p=xenclient%2Fxen-pq.git

Fix another rc3 merge issue.
---

diff --git a/xen-3.4/power-management-enhancement b/xen-3.4/power-management-enhancement
index 36e3e5a..299d3c0 100644
--- a/xen-3.4/power-management-enhancement
+++ b/xen-3.4/power-management-enhancement
@@ -871,7 +871,7 @@ index 0000000..9e5ad53
 +}
 +
 diff --git a/tools/xenpmd/xenpmd.c b/tools/xenpmd/xenpmd.c
-index 28de744..cc6a47f 100644
+index 28de744..db8e292 100644
 --- a/tools/xenpmd/xenpmd.c
 +++ b/tools/xenpmd/xenpmd.c
 @@ -40,10 +40,11 @@
@@ -999,7 +999,7 @@ index 28de744..cc6a47f 100644
  /* Borrowed daemonize from xenstored - Initially written by Stevens. */
  static void daemonize(void)
  {
-@@ -493,24 +513,56 @@ static void daemonize(void)
+@@ -493,24 +513,53 @@ static void daemonize(void)
  
      umask(0);
  }
@@ -1018,9 +1018,9 @@ index 28de744..cc6a47f 100644
 + */
 +static void *worker_thread_routine(void *arg)
  {
- #ifndef RUN_STANDALONE
-     daemonize();
- #endif
+-#ifndef RUN_STANDALONE
+-    daemonize();
+-#endif
      xs = (struct xs_handle *)xs_daemon_open();
 -    if ( xs == NULL ) 
 -        return -1;