Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:23:38 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: reservation.h
src/sys/external/bsd/drm2/linux: linux_reservation.c
Log Message:
Let's try spelling the member the same way Linux does.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/include/linux/reservation.h
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/drm2/linux/linux_reservation.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/reservation.h
diff -u src/sys/external/bsd/drm2/include/linux/reservation.h:1.13 src/sys/external/bsd/drm2/include/linux/reservation.h:1.14
--- src/sys/external/bsd/drm2/include/linux/reservation.h:1.13 Sun Dec 19 01:21:37 2021
+++ src/sys/external/bsd/drm2/include/linux/reservation.h Sun Dec 19 01:23:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: reservation.h,v 1.13 2021/12/19 01:21:37 riastradh Exp $ */
+/* $NetBSD: reservation.h,v 1.14 2021/12/19 01:23:38 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
struct reservation_object {
struct ww_mutex lock;
- struct seqcount count;
+ struct seqcount seq;
struct dma_fence __rcu *robj_fence;
struct reservation_object_list __rcu *robj_list;
Index: src/sys/external/bsd/drm2/linux/linux_reservation.c
diff -u src/sys/external/bsd/drm2/linux/linux_reservation.c:1.18 src/sys/external/bsd/drm2/linux/linux_reservation.c:1.19
--- src/sys/external/bsd/drm2/linux/linux_reservation.c:1.18 Sun Dec 19 01:21:38 2021
+++ src/sys/external/bsd/drm2/linux/linux_reservation.c Sun Dec 19 01:23:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_reservation.c,v 1.18 2021/12/19 01:21:38 riastradh Exp $ */
+/* $NetBSD: linux_reservation.c,v 1.19 2021/12/19 01:23:38 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.18 2021/12/19 01:21:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.19 2021/12/19 01:23:38 riastradh Exp $");
#include <sys/param.h>
#include <sys/poll.h>
@@ -91,7 +91,7 @@ reservation_object_init(struct reservati
{
ww_mutex_init(&robj->lock, &reservation_ww_class);
- seqcount_init(&robj->count);
+ seqcount_init(&robj->seq);
robj->robj_fence = NULL;
robj->robj_list = NULL;
robj->robj_prealloc = NULL;
@@ -308,7 +308,7 @@ reservation_object_write_begin(struct re
KASSERT(reservation_object_held(robj));
- write_seqcount_begin(&robj->count);
+ write_seqcount_begin(&robj->seq);
}
/*
@@ -326,7 +326,7 @@ reservation_object_write_commit(struct r
KASSERT(reservation_object_held(robj));
- write_seqcount_end(&robj->count);
+ write_seqcount_end(&robj->seq);
}
struct reservation_object_read_ticket {
@@ -345,7 +345,7 @@ reservation_object_read_begin(struct res
struct reservation_object_read_ticket *ticket)
{
- ticket->version = read_seqcount_begin(&robj->count);
+ ticket->version = read_seqcount_begin(&robj->seq);
}
/*
@@ -360,7 +360,7 @@ reservation_object_read_valid(struct res
struct reservation_object_read_ticket *ticket)
{
- return !read_seqcount_retry(&robj->count, ticket->version);
+ return !read_seqcount_retry(&robj->seq, ticket->version);
}
/*
