Fix another rc3 merge issue.

diff --git a/xen-3.4/power-management-enhancement b/xen-3.4/power-management-enhancement
index 36e3e5afb7b2c4d5747f484e64ff25501fb4fdb2..299d3c0495b740ee19f6cb8a8bad650d52b5a5ff 100644 (file)
--- 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;