[ros-diffs] [navaraf] 14280: Merge from HEAD: r14186

Merge from HEAD: r14186
- Fix acpi_os_get_thread_id to return 1-based thread ids (instead of
zero-based ones).
- Zero the owner_id field while initializing acpi_gbl_acpi_mutex_info.
Modified: branches/ros-branch-0_2_6/reactos/drivers/bus/acpi/ospm/osl.c
Modified:
branches/ros-branch-0_2_6/reactos/drivers/bus/acpi/utils/cmglobal.c
  _____  

Modified: branches/ros-branch-0_2_6/reactos/drivers/bus/acpi/ospm/osl.c
--- branches/ros-branch-0_2_6/reactos/drivers/bus/acpi/ospm/osl.c
2005-03-23 17:10:03 UTC (rev 14279)
+++ branches/ros-branch-0_2_6/reactos/drivers/bus/acpi/ospm/osl.c
2005-03-23 17:10:54 UTC (rev 14280)
@@ -601,5 +601,5 @@

 u32
 acpi_os_get_thread_id (void)
 {
-  return (ULONG)PsGetCurrentThreadId();
+  return (ULONG)PsGetCurrentThreadId() + 1;
 }
  _____  

Modified:
branches/ros-branch-0_2_6/reactos/drivers/bus/acpi/utils/cmglobal.c
--- branches/ros-branch-0_2_6/reactos/drivers/bus/acpi/utils/cmglobal.c
2005-03-23 17:10:03 UTC (rev 14279)
+++ branches/ros-branch-0_2_6/reactos/drivers/bus/acpi/utils/cmglobal.c
2005-03-23 17:10:54 UTC (rev 14280)
@@ -389,6 +389,7 @@

 		acpi_gbl_acpi_mutex_info[i].mutex   = NULL;
 		acpi_gbl_acpi_mutex_info[i].locked  = FALSE;
 		acpi_gbl_acpi_mutex_info[i].use_count = 0;
+		acpi_gbl_acpi_mutex_info[i].owner_id = 0;
 	}
 
 	/* Global notify handlers */