X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d9a64523371fa019c4575bb400cbbc3a50ac9903..c6bf4f310a33a9262d455ea4d3f0630b1255e3fe:/osfmk/kperf/kperf_timer.h

diff --git a/osfmk/kperf/kperf_timer.h b/osfmk/kperf/kperf_timer.h
index 3d5b91cad..b59e1f8a3 100644
--- a/osfmk/kperf/kperf_timer.h
+++ b/osfmk/kperf/kperf_timer.h
@@ -4,7 +4,7 @@
  * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -13,10 +13,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -24,7 +24,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
@@ -34,8 +34,8 @@
 struct kperf_timer {
 	struct timer_call tcall;
 	uint64_t period;
-	unsigned actionid;
-	volatile unsigned active;
+	_Atomic uint32_t action_state;
+	uint32_t actionid;
 
 	/*
 	 * A bitmap of CPUs that have a pending timer to service.  On Intel, it
@@ -44,7 +44,7 @@ struct kperf_timer {
 	 * the signal handler to multiplex simultaneous fires of different
 	 * timers.
 	 */
-	bitmap_t pending_cpus;
+	_Atomic bitmap_t pending_cpus;
 
 #if DEVELOPMENT || DEBUG
 	uint64_t fire_time;