Changeset 63e27ef in mainline for kernel/generic/include/synch

Timestamp:

2017-06-19T21:47:42Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

deacc58d

Parents:

7354b5e

Message:

ASSERT → assert

Location:

kernel/generic/include/synch

Files:

• rcu.h (modified) (4 diffs)
• spinlock.h (modified) (4 diffs)

kernel/generic/include/synch/rcu.h

@@ -36 +36 @@
 #define KERN_RCU_H_
 
+#include <assert.h>
 #include <synch/rcu_types.h>
 #include <compiler/barrier.h>
@@ -162 +163 @@
 static inline void _rcu_record_qs(void)
 {
-        ASSERT(PREEMPTION_DISABLED || interrupts_disabled());
+        assert(PREEMPTION_DISABLED || interrupts_disabled());
         
         /* 
@@ -207 +208 @@
 static inline void rcu_read_lock(void)
 {
-        ASSERT(CPU);
+        assert(CPU);
         preemption_disable();
 
@@ -222 +223 @@
 static inline void rcu_read_unlock(void)
 {
-        ASSERT(CPU);
+        assert(CPU);
         preemption_disable();
         

kernel/generic/include/synch/spinlock.h

@@ -38 +38 @@
 #include <stdbool.h>
 #include <arch/barrier.h>
+#include <assert.h>
 #include <preemption.h>
 #include <atomic.h>
-#include <debug.h>
 #include <arch/asm.h>
 
@@ -80 +80 @@
 
 #define ASSERT_SPINLOCK(expr, lock) \
-        ASSERT_VERBOSE(expr, (lock)->name)
+        assert_verbose(expr, (lock)->name)
 
 #define spinlock_lock(lock)    spinlock_lock_debug((lock))
@@ -98 +98 @@
 
 #define ASSERT_SPINLOCK(expr, lock) \
-        ASSERT(expr)
+        assert(expr)
 
 #define spinlock_lock(lock)    atomic_lock_arch(&(lock)->val)
@@ -175 +175 @@
 #define SPINLOCK_STATIC_INITIALIZE_NAME(name, desc_name)
 
-#define ASSERT_SPINLOCK(expr, lock)  ASSERT(expr)
+#define ASSERT_SPINLOCK(expr, lock)  assert(expr)
 
 #define spinlock_initialize(lock, name)