Changeset cc106e4 in mainline for kernel/generic

Timestamp:

2012-11-07T18:44:33Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

fc89e32

Parents:

2708f6a

Message:

Fixed build for sparc64/ultra, sparc64/niagara, ppc32, mips32/GXemul.

Location:

kernel/generic

Files:

• include/synch/condvar.h (modified) (2 diffs)
• include/synch/spinlock.h (modified) (3 diffs)
• src/smp/smp_call.c (modified) (1 diff)
• src/synch/condvar.c (modified) (1 diff)
• src/synch/rcu.c (modified) (1 diff)

kernel/generic/include/synch/condvar.h

@@ -51 +51 @@
         _condvar_wait_timeout((cv), (mtx), (usec), SYNCH_FLAGS_NONE)
 
+#ifdef CONFIG_SMP
+#define _condvar_wait_timeout_spinlock(cv, lock, usec, flags) \
+        _condvar_wait_timeout_spinlock_impl((cv), (lock), (usec), (flags))
+#else
+#define _condvar_wait_timeout_spinlock(cv, lock, usec, flags) \
+        _condvar_wait_timeout_spinlock_impl((cv), NULL, (usec), (flags))
+#endif
+
 extern void condvar_initialize(condvar_t *cv);
 extern void condvar_signal(condvar_t *cv);
@@ -56 +64 @@
 extern int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec,
     int flags);
-extern int _condvar_wait_timeout_spinlock(condvar_t *cv, spinlock_t *lock, 
+extern int _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock, 
         uint32_t usec, int flags);
 extern int _condvar_wait_timeout_irq_spinlock(condvar_t *cv, 

kernel/generic/include/synch/spinlock.h

@@ -45 +45 @@
 #ifdef CONFIG_SMP
 
-typedef struct {
+typedef struct spinlock {
         atomic_t val;
         
@@ -162 +162 @@
 /* On UP systems, spinlocks are effectively left out. */
 
+/* Allow the use of spinlock_t as an incomplete type. */
+typedef struct spinlock spinlock_t;
+
 #define SPINLOCK_DECLARE(name)
 #define SPINLOCK_EXTERN(name)
@@ -176 +179 @@
 
 #define spinlock_lock(lock)     preemption_disable()
-#define spinlock_trylock(lock)  (preemption_disable(), 1)
+#define spinlock_trylock(lock)  ({ preemption_disable(); 1; })
 #define spinlock_unlock(lock)   preemption_enable()
 #define spinlock_locked(lock)   1

kernel/generic/src/smp/smp_call.c

@@ -131 +131 @@
                 /*
                  * If a platform supports SMP it must implement arch_smp_call_ipi().
-                 * It should issue an IPI an cpu_id and invoke smp_call_ipi_recv()
+                 * It should issue an IPI on cpu_id and invoke smp_call_ipi_recv()
                  * on cpu_id in turn. 
                  * 

kernel/generic/src/synch/condvar.c

@@ -120 +120 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout_spinlock(condvar_t *cv, spinlock_t *lock, 
+int _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock, 
         uint32_t usec, int flags)
 {

kernel/generic/src/synch/rcu.c

@@ -861 +861 @@
                         
                         /* Wait for the GP to complete. */
-                        int ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, 
-                                &rcu.gp_lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
+                        int ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, &rcu.gp_lock, 
+                                SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
                         
                         if (ret == ESYNCH_INTERRUPTED) {