 @@ -1,14 +1,14 @@
-/*	$NetBSD: drmP.h,v 1.14 2018/08/27 04:58:37 riastradh Exp $	*/
+/*	$NetBSD: drmP.h,v 1.15 2018/08/27 06:17:30 riastradh Exp $	*/
 /*
  * Internal Header for the Direct Rendering Manager
+ *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * Copyright (c) 2009-2010, Code Aurora Forum.
  * All rights reserved.
+ *
  * Author: Rickard E. (Rik) Faith <faith@valinux.com>
  * Author: Gareth Hughes <gareth@valinux.com>
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
 @@ -86,26 +86,27 @@
 #endif
 #include <drm/drm_sarea.h>
 #include <drm/drm_vma_manager.h>
 struct module;
 struct drm_file;
 struct drm_device;
 struct drm_agp_head;
 struct drm_local_map;
 struct drm_device_dma;
 struct drm_dma_handle;
 struct drm_gem_object;
 struct drm_bus_irq_cookie;
 struct device_node;
 struct videomode;
 struct reservation_object;
 struct dma_buf_attachment;
 /*
  * 4 debug categories are defined:
+ *
  * CORE: Used in the generic drm code: drm_ioctl.c, drm_mm.c, drm_memory.c, ...
  *	 This is the category used by the DRM_DEBUG() macro.
+ *
  * DRIVER: Used in the vendor specific part of the driver: i915, radeon, ...

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dma-mapping.h,v 1.3 2014/08/06 13:50:53 riastradh Exp $	*/
+/*	$NetBSD: dma-mapping.h,v 1.4 2018/08/27 06:17:30 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,23 +24,25 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _LINUX_DMA_MAPPING_H_
 #define _LINUX_DMA_MAPPING_H_
 #include <sys/bus.h>
 #include <linux/bug.h>
 typedef bus_addr_t dma_addr_t;
 static inline uintmax_t
 DMA_BIT_MASK(unsigned nbits)
+{
 	return ~(~(uintmax_t)0 << nbits);
+}
 #endif  /* _LINUX_DMA_MAPPING_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.8 2018/08/27 06:06:41 riastradh Exp $	*/
+/*	$NetBSD: mutex.h,v 1.9 2018/08/27 06:17:30 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,28 +27,29 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _LINUX_MUTEX_H_
 #define _LINUX_MUTEX_H_
 #include <sys/mutex.h>
 #include <lib/libkern/libkern.h> /* KASSERT */
 #include <linux/list.h>
-#define	__acquires(lock)	/* XXX lockdep stuff */
+#define	__acquires(lock)			/* XXX lockdep stuff */
-#define	__releases(lock)	/* XXX lockdep stuff */
+#define	__releases(lock)			/* XXX lockdep stuff */
 #define might_lock(lock) do {} while(0) 	/* XXX lockdep stuff */
 struct mutex {
 	kmutex_t mtx_lock;
 };
 struct lock_class_key {
 };
 /* Name collision.  Pooh.  */
 static inline void
 linux_mutex_init(struct mutex *mutex)
+{
 	mutex_init(&mutex->mtx_lock, MUTEX_DEFAULT, IPL_NONE);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sched.h,v 1.6 2018/08/27 06:07:32 riastradh Exp $	*/
+/*	$NetBSD: sched.h,v 1.7 2018/08/27 06:17:30 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,26 +27,27 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _LINUX_SCHED_H_
 #define _LINUX_SCHED_H_
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <asm/param.h>
 #include <asm/barrier.h>
 #include <linux/errno.h>
 #define	TASK_COMM_LEN	MAXCOMLEN
 #define	current	curproc
 static inline pid_t
 task_pid_nr(struct proc *p)
+{
 	return p->p_pid;
+}
 static inline long

 @@ -1,14 +1,14 @@
-/*	$NetBSD: spinlock.h,v 1.7 2016/04/13 08:43:56 riastradh Exp $	*/
+/*	$NetBSD: spinlock.h,v 1.8 2018/08/27 06:17:30 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -26,26 +26,28 @@
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _LINUX_SPINLOCK_H_
 #define _LINUX_SPINLOCK_H_
 #include <sys/cdefs.h>
 #include <sys/mutex.h>
 #include <machine/limits.h>
 #include <linux/irqflags.h>
 #include <linux/preempt.h>
 #define	__acquires(lock)	/* XXX lockdep stuff */
 #define	__releases(lock)	/* XXX lockdep stuff */
 typedef struct spinlock {
 	kmutex_t sl_lock;
 } spinlock_t;
 static inline int
 spin_is_locked(spinlock_t *spinlock)
+{
 	return mutex_owned(&spinlock->sl_lock);
+}