Module Name: src
Committed By: riastradh
Date: Mon Aug 27 15:10:53 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/include/linux: atomic.h
src/sys/external/bsd/drm2/linux: linux_atomic64.c
Log Message:
Fix argument types of atomic64_add/sub to be sensible.
Technically Linux does use long long rather than int64_t, but that's
silly.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/include/linux/atomic.h
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/linux/linux_atomic64.c
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.16 src/sys/external/bsd/drm2/include/linux/atomic.h:1.17
--- src/sys/external/bsd/drm2/include/linux/atomic.h:1.16 Mon Aug 27 15:10:41 2018
+++ src/sys/external/bsd/drm2/include/linux/atomic.h Mon Aug 27 15:10:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.h,v 1.16 2018/08/27 15:10:41 riastradh Exp $ */
+/* $NetBSD: atomic.h,v 1.17 2018/08/27 15:10:52 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -251,14 +251,14 @@ atomic64_set(struct atomic64 *a, uint64_
}
static inline void
-atomic64_add(long long d, struct atomic64 *a)
+atomic64_add(int64_t d, struct atomic64 *a)
{
/* no membar */
atomic_add_64(&a->a_v, d);
}
static inline void
-atomic64_sub(long long d, struct atomic64 *a)
+atomic64_sub(int64_t d, struct atomic64 *a)
{
/* no membar */
atomic_add_64(&a->a_v, -d);
@@ -304,8 +304,8 @@ atomic64_cmpxchg(struct atomic64 *atomic
uint64_t atomic64_read(const struct atomic64 *);
void atomic64_set(struct atomic64 *, uint64_t);
-void atomic64_add(long long, struct atomic64 *);
-void atomic64_sub(long long, struct atomic64 *);
+void atomic64_add(int64_t, struct atomic64 *);
+void atomic64_sub(int64_t, struct atomic64 *);
uint64_t atomic64_xchg(struct atomic64 *, uint64_t);
uint64_t atomic64_cmpxchg(struct atomic64 *, uint64_t, uint64_t);
Index: src/sys/external/bsd/drm2/linux/linux_atomic64.c
diff -u src/sys/external/bsd/drm2/linux/linux_atomic64.c:1.1 src/sys/external/bsd/drm2/linux/linux_atomic64.c:1.2
--- src/sys/external/bsd/drm2/linux/linux_atomic64.c:1.1 Mon Aug 27 15:08:54 2018
+++ src/sys/external/bsd/drm2/linux/linux_atomic64.c Mon Aug 27 15:10:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_atomic64.c,v 1.1 2018/08/27 15:08:54 riastradh Exp $ */
+/* $NetBSD: linux_atomic64.c,v 1.2 2018/08/27 15:10:53 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_atomic64.c,v 1.1 2018/08/27 15:08:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_atomic64.c,v 1.2 2018/08/27 15:10:53 riastradh Exp $");
#include <sys/param.h>
#include <sys/bitops.h>
@@ -147,7 +147,7 @@ atomic64_set(struct atomic64 *a, uint64_
}
void
-atomic64_add(long long delta, struct atomic64 *a)
+atomic64_add(int64_t delta, struct atomic64 *a)
{
atomic64_lock(a);
@@ -156,7 +156,7 @@ atomic64_add(long long delta, struct ato
}
void
-atomic64_sub(long long delta, struct atomic64 *a)
+atomic64_sub(int64_t delta, struct atomic64 *a)
{
atomic64_lock(a);
