projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fix insta-reboot with "i386: Relocatable kernel support"
[deliverable/linux.git]
/
include
/
asm-arm
/
atomic.h
diff --git
a/include/asm-arm/atomic.h
b/include/asm-arm/atomic.h
index 4b0ce3e7de9a4267088ab585e46232214b139879..ea88aa6bfc78e91c9d0442ab2b504e3ddabe1c56 100644
(file)
--- a/
include/asm-arm/atomic.h
+++ b/
include/asm-arm/atomic.h
@@
-128,10
+128,10
@@
static inline int atomic_add_return(int i, atomic_t *v)
unsigned long flags;
int val;
unsigned long flags;
int val;
- local_irq_save(flags);
+
raw_
local_irq_save(flags);
val = v->counter;
v->counter = val += i;
val = v->counter;
v->counter = val += i;
- local_irq_restore(flags);
+
raw_
local_irq_restore(flags);
return val;
}
return val;
}
@@
-141,10
+141,10
@@
static inline int atomic_sub_return(int i, atomic_t *v)
unsigned long flags;
int val;
unsigned long flags;
int val;
- local_irq_save(flags);
+
raw_
local_irq_save(flags);
val = v->counter;
v->counter = val -= i;
val = v->counter;
v->counter = val -= i;
- local_irq_restore(flags);
+
raw_
local_irq_restore(flags);
return val;
}
return val;
}
@@
-154,11
+154,11
@@
static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
int ret;
unsigned long flags;
int ret;
unsigned long flags;
- local_irq_save(flags);
+
raw_
local_irq_save(flags);
ret = v->counter;
if (likely(ret == old))
v->counter = new;
ret = v->counter;
if (likely(ret == old))
v->counter = new;
- local_irq_restore(flags);
+
raw_
local_irq_restore(flags);
return ret;
}
return ret;
}
@@
-167,9
+167,9
@@
static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
{
unsigned long flags;
{
unsigned long flags;
- local_irq_save(flags);
+
raw_
local_irq_save(flags);
*addr &= ~mask;
*addr &= ~mask;
- local_irq_restore(flags);
+
raw_
local_irq_restore(flags);
}
#endif /* __LINUX_ARM_ARCH__ */
}
#endif /* __LINUX_ARM_ARCH__ */
This page took
0.02674 seconds
and
5
git commands to generate.