Changeset 8aa9265 in mainline

Timestamp:

2010-05-21T12:39:05Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7de7cde

Parents:

d0ee0de

Message:

improve compatibility of interrupts-disabled spinlocks with non-SMP builds

File:

• kernel/generic/include/synch/spinlock.h (modified) (2 diffs)

kernel/generic/include/synch/spinlock.h

@@ -184 +184 @@
 
 typedef struct {
-        SPINLOCK_DECLARE(lock); /**< Spinlock */
-        bool guard;             /**< Flag whether ipl is valid */
-        ipl_t ipl;              /**< Original interrupt level */
+        SPINLOCK_DECLARE(lock);  /**< Spinlock */
+        bool guard;              /**< Flag whether ipl is valid */
+        ipl_t ipl;               /**< Original interrupt level */
 } irq_spinlock_t;
 
 #define IRQ_SPINLOCK_DECLARE(lock_name)  irq_spinlock_t lock_name
 #define IRQ_SPINLOCK_EXTERN(lock_name)   extern irq_spinlock_t lock_name
+
+#ifdef CONFIG_SMP
 
 #define ASSERT_IRQ_SPINLOCK(expr, irq_lock) \
@@ -243 +245 @@
 
 #endif /* CONFIG_DEBUG_SPINLOCK */
+
+#else /* CONFIG_SMP */
+
+/*
+ * Since the spinlocks are void on UP systems, we also need
+ * to have a special variant of interrupts-disabled spinlock
+ * macros which take this into account.
+ */
+
+#define ASSERT_IRQ_SPINLOCK(expr, irq_lock) \
+        ASSERT_SPINLOCK(expr, NULL)
+
+#define IRQ_SPINLOCK_INITIALIZE_NAME(lock_name, desc_name) \
+        irq_spinlock_t lock_name = { \
+                .guard = false, \
+                .ipl = 0 \
+        }
+
+#define IRQ_SPINLOCK_STATIC_INITIALIZE_NAME(lock_name, desc_name) \
+        static irq_spinlock_t lock_name = { \
+                .guard = false, \
+                .ipl = 0 \
+        }
+
+#endif /* CONFIG_SMP */
 
 #define IRQ_SPINLOCK_INITIALIZE(lock_name) \