From 4d88dfc7abf9e2b566136037bc405942c35a452c Mon Sep 17 00:00:00 2001
From: fche <fche>
Date: Tue, 29 May 2007 19:24:36 +0000
Subject: 2007-05-29  Frank Ch. Eigler  <fche@redhat.com>

	PR 2224
	* map.h (NEED_MAP_LOCKS): New config macro, defaults to 0.
	(MAP_GET_CPU, MAP_PUT_CPU): Wrappers, default to ~no-op.
	* map.c (_stp_pmap_clear,agg): Use them.
	* pmap-gen.c (_stp_pmap_new,set,add,get_cpu,get,del): Ditto.
---
 runtime/map.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'runtime/map.c')

diff --git a/runtime/map.c b/runtime/map.c
index e4235901..2acf2fe2 100644
--- a/runtime/map.c
+++ b/runtime/map.c
@@ -369,9 +369,13 @@ void _stp_pmap_clear(PMAP pmap)
 
 	for_each_cpu(i) {
 		MAP m = per_cpu_ptr (pmap->map, i);
+#if NEED_MAP_LOCKS
 		spin_lock(&m->lock);
+#endif
 		_stp_map_clear(m);
+#if NEED_MAP_LOCKS
 		spin_unlock(&m->lock);
+#endif
 	}
 	_stp_map_clear(&pmap->agg);
 }
@@ -873,7 +877,9 @@ MAP _stp_pmap_agg (PMAP pmap)
 
 	for_each_cpu(i) {
 		m = per_cpu_ptr (pmap->map, i);
+#if NEED_MAP_LOCKS
 		spin_lock(&m->lock);
+#endif
 		/* walk the hash chains. */
 		for (hash = 0; hash < HASH_TABLE_SIZE; hash++) {
 			head = &m->hashes[hash];
@@ -892,13 +898,17 @@ MAP _stp_pmap_agg (PMAP pmap)
 					_stp_add_agg(aptr, ptr);
 				else {
 					if (!_stp_new_agg(agg, ahead, ptr)) {
+#if NEED_MAP_LOCKS
 						spin_unlock(&m->lock);
+#endif
 						return NULL;
 					}
 				}
 			}
 		}
+#if NEED_MAP_LOCKS
 		spin_unlock(&m->lock);
+#endif
 	}
 	return agg;
 }
-- 
cgit