projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'rtc-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
[linux-2.6-microblaze.git]
/
include
/
linux
/
bitops.h
diff --git
a/include/linux/bitops.h
b/include/linux/bitops.h
index
705f7c4
..
602af23
100644
(file)
--- a/
include/linux/bitops.h
+++ b/
include/linux/bitops.h
@@
-246,7
+246,7
@@
static __always_inline void __assign_bit(long nr, volatile unsigned long *addr,
new__ = (old__ & ~mask__) | bits__; \
} while (cmpxchg(ptr, old__, new__) != old__); \
\
-
new
__; \
+
old
__; \
})
#endif