URCU list: remove leftover namespace clash (list_t type removed)

[urcu.git] / urcu / arch_armv7l.h

diff --git a/urcu/arch_armv7l.h b/urcu/arch_armv7l.h
index b4049cdd183a03e4e98107077887b6a1479d1e24..125066b8239190b5be4580c11ba406a7baa8be7e 100644 (file)
--- a/urcu/arch_armv7l.h
+++ b/urcu/arch_armv7l.h
@@ -5,7 +5,7 @@
  * arch_armv7l.h: trivial definitions for the ARMv7 architecture.
  *
  * Copyright (c) 2010 Paul E. McKenney, IBM Corporation.
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,14 +29,14 @@
 extern "C" {
 #endif 
 
-#define mb()    asm volatile("dmb":::"memory")
+#define cmm_mb()    asm volatile("dmb":::"memory")
 
 #include <stdlib.h>
 #include <sys/time.h>
 
 typedef unsigned long long cycles_t;
 
-static inline cycles_t get_cycles (void)
+static inline cycles_t caa_get_cycles (void)
 {
        cycles_t thetime;
        struct timeval tv;