diff options
| author | Stefan Schmidt <[email protected]> | 2019-03-19 16:25:37 +0100 |
|---|---|---|
| committer | Stefan Schmidt <[email protected]> | 2019-03-19 16:25:37 +0100 |
| commit | 86008304dc2ad41a274cdacb585c641ec6bbb558 (patch) | |
| tree | 7d8fdd6d9cbba05cebb7d36c4309ea2bb48e0af0 /include/linux/bitops.h | |
| parent | 19b39a25388e71390e059906c979f87be4ef0c71 (diff) | |
| parent | ffa91253739ca89fc997195d8bbd1f7ba3e29fbe (diff) | |
Merge remote-tracking branch 'net/master'
Diffstat (limited to 'include/linux/bitops.h')
| -rw-r--r-- | include/linux/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 705f7c442691..602af23b98c7 100644 --- 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 |