git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
asm-generic: rename atomic.h to atomic-long.h
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
include
/
asm
/
atomic.h
diff --git
a/arch/s390/include/asm/atomic.h
b/arch/s390/include/asm/atomic.h
index de432f2de2d22ed3f9f2362023a52caacea1bcb2..fca9dffcc669b186f779785ae8d1ac3a9858c356 100644
(file)
--- a/
arch/s390/include/asm/atomic.h
+++ b/
arch/s390/include/asm/atomic.h
@@
-275,6
+275,6
@@
static __inline__ int atomic64_add_unless(atomic64_t *v,
#define smp_mb__before_atomic_inc() smp_mb()
#define smp_mb__after_atomic_inc() smp_mb()
-#include <asm-generic/atomic.h>
+#include <asm-generic/atomic
-long
.h>
#endif /* __KERNEL__ */
#endif /* __ARCH_S390_ATOMIC__ */