Changeset 371bd7d in mainline for kernel/generic/include/synch


Ignore:
Timestamp:
2010-03-27T09:22:17Z (16 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
36a75a2
Parents:
cd82bb1 (diff), eaf22d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
kernel/generic/include/synch
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/synch/condvar.h

    rcd82bb1 r371bd7d  
    3636#define KERN_CONDVAR_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <synch/waitq.h>
    4040#include <synch/mutex.h>

  • kernel/generic/include/synch/futex.h

    rcd82bb1 r371bd7d  
    3636#define KERN_FUTEX_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <synch/waitq.h>
    40 #include <genarch/mm/page_ht.h>
    41 #include <genarch/mm/page_pt.h>
    4240
    4341/** Kernel-side futex structure. */
    … …  
    5452
    5553extern void futex_init(void);
    56 extern unative_t sys_futex_sleep_timeout(uintptr_t uaddr, uint32_t usec,
    57     int flags);
    58 extern unative_t sys_futex_wakeup(uintptr_t uaddr);
     54extern unative_t sys_futex_sleep(uintptr_t);
     55extern unative_t sys_futex_wakeup(uintptr_t);
    5956
    6057extern void futex_cleanup(void);

  • kernel/generic/include/synch/mutex.h

    rcd82bb1 r371bd7d  
    3636#define KERN_MUTEX_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <synch/semaphore.h>
    4040#include <synch/synch.h>

  • kernel/generic/include/synch/rwlock.h

    rcd82bb1 r371bd7d  
    3636#define KERN_RWLOCK_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <synch/mutex.h>
    4040#include <synch/synch.h>

  • kernel/generic/include/synch/semaphore.h

    rcd82bb1 r371bd7d  
    3636#define KERN_SEMAPHORE_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <synch/waitq.h>
    4040#include <synch/synch.h>

  • kernel/generic/include/synch/spinlock.h

    rcd82bb1 r371bd7d  
    3636#define KERN_SPINLOCK_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <arch/barrier.h>
    4040#include <preemption.h>
    … …  
    4848       
    4949#ifdef CONFIG_DEBUG_SPINLOCK
    50         char *name;
     50        const char *name;
    5151#endif
    5252} spinlock_t;
    … …  
    101101        SPINLOCK_STATIC_INITIALIZE_NAME(lock_name, #lock_name)
    102102
    103 extern void spinlock_initialize(spinlock_t *lock, char *name);
     103extern void spinlock_initialize(spinlock_t *lock, const char *name);
    104104extern int spinlock_trylock(spinlock_t *lock);
    105105extern void spinlock_lock_debug(spinlock_t *lock);

  • kernel/generic/include/synch/waitq.h

    rcd82bb1 r371bd7d  
    3636#define KERN_WAITQ_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <synch/spinlock.h>
    4040#include <synch/synch.h>
Note: See TracChangeset for help on using the changeset viewer.