slirp: Canonicalize restrict syntax

[qemu.git] / bitops.h

diff --git a/bitops.h b/bitops.h
index ae7bcb1b1c00d3284ec6deea0f920467ee90b91b..07d1a0638fea29226c2b2a4024f6bf138cfc21b9 100644 (file)
--- a/bitops.h
+++ b/bitops.h
@@ -66,7 +66,7 @@ static unsigned long bitops_ffsl(unsigned long word)
  *
  * Undefined if no set bit exists, so code should check against 0 first.
  */
-static __always_inline unsigned long bitops_flsl(unsigned long word)
+static inline unsigned long bitops_flsl(unsigned long word)
 {
        int num = BITS_PER_LONG - 1;
 
@@ -187,7 +187,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
 {
        unsigned long mask = BIT_MASK(nr);
        unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);
-       unsigned long old;
+       unsigned long old = *p;
 
        *p = old ^ mask;
        return (old & mask) != 0;