Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:35:51 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: irq_work.h spinlock.h timer.h
Log Message:
linux: Odds and ends.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/irq_work.h
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/include/linux/spinlock.h \
src/sys/external/bsd/drm2/include/linux/timer.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/irq_work.h
diff -u src/sys/external/bsd/drm2/include/linux/irq_work.h:1.4 src/sys/external/bsd/drm2/include/linux/irq_work.h:1.5
--- src/sys/external/bsd/drm2/include/linux/irq_work.h:1.4 Sun Dec 19 11:26:35 2021
+++ src/sys/external/bsd/drm2/include/linux/irq_work.h Sun Dec 19 11:35:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: irq_work.h,v 1.4 2021/12/19 11:26:35 riastradh Exp $ */
+/* $NetBSD: irq_work.h,v 1.5 2021/12/19 11:35:51 riastradh Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -38,7 +38,8 @@
#define irq_work_queue linux_irq_work_queue
struct irq_work {
- char dummy;
+ /* Linux API */
+ void (*func)(struct irq_work *);
};
void init_irq_work(struct irq_work *, void (*)(struct irq_work *));
Index: src/sys/external/bsd/drm2/include/linux/spinlock.h
diff -u src/sys/external/bsd/drm2/include/linux/spinlock.h:1.10 src/sys/external/bsd/drm2/include/linux/spinlock.h:1.11
--- src/sys/external/bsd/drm2/include/linux/spinlock.h:1.10 Sun Dec 19 01:45:05 2021
+++ src/sys/external/bsd/drm2/include/linux/spinlock.h Sun Dec 19 11:35:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spinlock.h,v 1.10 2021/12/19 01:45:05 riastradh Exp $ */
+/* $NetBSD: spinlock.h,v 1.11 2021/12/19 11:35:51 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -94,6 +94,9 @@ spin_lock_nested(spinlock_t *spinlock, i
spin_lock(spinlock);
}
+#define spin_lock_irqsave_nested(SPINLOCK, FLAGS, SUBCLASS) \
+ spin_lock_irqsave(SPINLOCK, FLAGS)
+
static inline void
spin_lock_init(spinlock_t *spinlock)
{
Index: src/sys/external/bsd/drm2/include/linux/timer.h
diff -u src/sys/external/bsd/drm2/include/linux/timer.h:1.10 src/sys/external/bsd/drm2/include/linux/timer.h:1.11
--- src/sys/external/bsd/drm2/include/linux/timer.h:1.10 Sun Dec 19 10:38:05 2021
+++ src/sys/external/bsd/drm2/include/linux/timer.h Sun Dec 19 11:35:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.h,v 1.10 2021/12/19 10:38:05 riastradh Exp $ */
+/* $NetBSD: timer.h,v 1.11 2021/12/19 11:35:51 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -50,6 +50,8 @@ struct timer_list {
#define from_timer(V, T, F) container_of(T, __typeof__(*(V)), F)
+#define TIMER_IRQSAFE __BIT(0)
+
static inline void
timer_setup(struct timer_list *timer, void (*fn)(struct timer_list *),
uintptr_t flags)
