Changeset bd48f4c in mainline for kernel/arch/mips32/include/atomic.h


Ignore:
Timestamp:
2010-07-12T10:53:30Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bd11d3e
Parents:
c40e6ef (diff), bee2d4c (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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/mips32/include/atomic.h

    rc40e6ef rbd48f4c  
    3636#define KERN_mips32_ATOMIC_H_
    3737
     38#include <trace.h>
     39
    3840#define atomic_inc(x)  ((void) atomic_add(x, 1))
    3941#define atomic_dec(x)  ((void) atomic_add(x, -1))
    … …  
    5355 *
    5456 */
    55 static inline atomic_count_t atomic_add(atomic_t *val, atomic_count_t i)
     57NO_TRACE static inline atomic_count_t atomic_add(atomic_t *val,
     58    atomic_count_t i)
    5659{
    5760        atomic_count_t tmp;
    … …  
    7679}
    7780
    78 static inline atomic_count_t test_and_set(atomic_t *val)
     81NO_TRACE static inline atomic_count_t test_and_set(atomic_t *val)
    7982{
    8083        atomic_count_t tmp;
    … …  
    98101}
    99102
    100 static inline void atomic_lock_arch(atomic_t *val)
     103NO_TRACE static inline void atomic_lock_arch(atomic_t *val)
    101104{
    102105        do {
Note: See TracChangeset for help on using the changeset viewer.