[src/trunk]: src/sys/external/bsd/drm2/include/linux linux: Odds and ends.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0e29b6a9e534
branches:  trunk
changeset: 1028651:0e29b6a9e534
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:35:51 2021 +0000

description:
linux: Odds and ends.

diffstat:

 sys/external/bsd/drm2/include/linux/irq_work.h |  5 +++--
 sys/external/bsd/drm2/include/linux/spinlock.h |  5 ++++-
 sys/external/bsd/drm2/include/linux/timer.h    |  4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r cc7ebcc7f2fd -r 0e29b6a9e534 sys/external/bsd/drm2/include/linux/irq_work.h
--- a/sys/external/bsd/drm2/include/linux/irq_work.h    Sun Dec 19 11:35:44 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/irq_work.h    Sun Dec 19 11:35:51 2021 +0000
@@ -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 *));
diff -r cc7ebcc7f2fd -r 0e29b6a9e534 sys/external/bsd/drm2/include/linux/spinlock.h
--- a/sys/external/bsd/drm2/include/linux/spinlock.h    Sun Dec 19 11:35:44 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/spinlock.h    Sun Dec 19 11:35:51 2021 +0000
@@ -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(spinlock);
 }
 
+#define        spin_lock_irqsave_nested(SPINLOCK, FLAGS, SUBCLASS)                   \
+       spin_lock_irqsave(SPINLOCK, FLAGS)
+
 static inline void
 spin_lock_init(spinlock_t *spinlock)
 {
diff -r cc7ebcc7f2fd -r 0e29b6a9e534 sys/external/bsd/drm2/include/linux/timer.h
--- a/sys/external/bsd/drm2/include/linux/timer.h       Sun Dec 19 11:35:44 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/timer.h       Sun Dec 19 11:35:51 2021 +0000
@@ -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 @@
 
 #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)