Fix rc3 merge issue.

diff --git a/xen-3.4/power-management-enhancement b/xen-3.4/power-management-enhancement
index b9bdb77dccbf30da0ae9d03a555107d1eaefe405..36e3e5afb7b2c4d5747f484e64ff25501fb4fdb2 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..9bc0cc1 100644
+index 28de744..cc6a47f 100644
 --- a/tools/xenpmd/xenpmd.c
 +++ b/tools/xenpmd/xenpmd.c
 @@ -40,10 +40,11 @@
@@ -999,7 +999,7 @@ index 28de744..9bc0cc1 100644
  /* Borrowed daemonize from xenstored - Initially written by Stevens. */
  static void daemonize(void)
  {
-@@ -493,24 +513,57 @@ static void daemonize(void)
+@@ -493,24 +513,56 @@ static void daemonize(void)
  
      umask(0);
  }
@@ -1031,7 +1031,6 @@ index 28de744..9bc0cc1 100644
 +    if ( xs == NULL )
 +        return NULL;
 +
-+    if ( write_one_time_battery_info() == 0 )
 +    initialize_system_state_info();
 +    monitor_acpi_events();
 +    if ( write_one_time_battery_info() == 0 )