From 517a318c8dff42f3791a35604ad83e8fc774f18e Mon Sep 17 00:00:00 2001 From: Kamala Narasimhan Date: Tue, 19 May 2009 14:38:17 -0400 Subject: [PATCH] Fix rc3 merge issue. --- xen-3.4/power-management-enhancement | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen-3.4/power-management-enhancement b/xen-3.4/power-management-enhancement index b9bdb77..36e3e5a 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..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 ) -- 2.39.5