Module Name: src
Committed By: riastradh
Date: Mon Aug 27 13:40:41 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/include/linux: atomic.h
Log Message:
Fix return types of test_and_{set,clear,change}_bit.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/include/linux/atomic.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/atomic.h
diff -u src/sys/external/bsd/drm2/include/linux/atomic.h:1.10 src/sys/external/bsd/drm2/include/linux/atomic.h:1.11
--- src/sys/external/bsd/drm2/include/linux/atomic.h:1.10 Mon Aug 27 07:14:19 2018
+++ src/sys/external/bsd/drm2/include/linux/atomic.h Mon Aug 27 13:40:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.h,v 1.10 2018/08/27 07:14:19 riastradh Exp $ */
+/* $NetBSD: atomic.h,v 1.11 2018/08/27 13:40:41 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -228,7 +228,7 @@ change_bit(unsigned int bit, volatile un
do v = *p; while (atomic_cas_ulong(p, v, (v ^ mask)) != v);
}
-static inline unsigned long
+static inline int
test_and_set_bit(unsigned int bit, volatile unsigned long *ptr)
{
const unsigned int units = (sizeof(*ptr) * CHAR_BIT);
@@ -241,7 +241,7 @@ test_and_set_bit(unsigned int bit, volat
return ((v & mask) != 0);
}
-static inline unsigned long
+static inline int
test_and_clear_bit(unsigned int bit, volatile unsigned long *ptr)
{
const unsigned int units = (sizeof(*ptr) * CHAR_BIT);
@@ -254,7 +254,7 @@ test_and_clear_bit(unsigned int bit, vol
return ((v & mask) != 0);
}
-static inline unsigned long
+static inline int
test_and_change_bit(unsigned int bit, volatile unsigned long *ptr)
{
const unsigned int units = (sizeof(*ptr) * CHAR_BIT);
