 @@ -1,14 +1,14 @@
-/*	$NetBSD: i915_gem_gtt.c,v 1.5 2018/08/27 04:58:23 riastradh Exp $	*/
+/*	$NetBSD: i915_gem_gtt.c,v 1.6 2018/08/27 06:08:25 riastradh Exp $	*/
 /*
  * Copyright © 2010 Daniel Vetter
  * Copyright © 2011-2014 Intel Corporation
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice (including the next
 @@ -16,27 +16,27 @@
  * Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.5 2018/08/27 04:58:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.6 2018/08/27 06:08:25 riastradh Exp $");
 #include <linux/err.h>
 #include <linux/seq_file.h>
 #include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 #include "i915_vgpu.h"
 #include "i915_trace.h"
 #include "intel_drv.h"
 #ifdef __NetBSD__
 #include <x86/machdep.h>
 #include <x86/pte.h>
 @@ -1676,27 +1676,26 @@ static void gen6_write_pde(struct i915_p
 	const bus_space_handle_t bsh = dev_priv->gtt.bsh;
 	const bus_addr_t pd_base = ppgtt->pd.base.ggtt_offset;
 #endif
 	u32 pd_entry;
 	pd_entry = GEN6_PDE_ADDR_ENCODE(px_dma(pt));
 	pd_entry |= GEN6_PDE_VALID;
 #ifdef __NetBSD__
 	bus_space_write_4(bst, bsh, pd_base + pde, pd_entry);
 #else
 	writel(pd_entry, ppgtt->pd_addr + pde);
 #endif
+}
 /* Write all the page tables found in the ppgtt structure to incrementing page
  * directories. */
 static void gen6_write_page_range(struct drm_i915_private *dev_priv,
 				  struct i915_page_directory *pd,
 				  uint32_t start, uint32_t length)
+{
 	struct i915_page_table *pt;
 	uint32_t pde, temp;
 	gen6_for_each_pde(pt, pd, start, length, temp, pde)
 		gen6_write_pde(pd, pde, pt);
 @@ -3311,27 +3310,26 @@ static int gen6_gmch_probe(struct drm_de
 	dev_priv->gtt.base.clear_range = gen6_ggtt_clear_range;
 	dev_priv->gtt.base.insert_entries = gen6_ggtt_insert_entries;
 	dev_priv->gtt.base.bind_vma = ggtt_bind_vma;
 	dev_priv->gtt.base.unbind_vma = ggtt_unbind_vma;
 	dev_priv->gtt.max_paddr = __BITS(39, 0);
 	return ret;
+}
 static void gen6_gmch_remove(struct i915_address_space *vm)
+{
 	struct i915_gtt *gtt = container_of(vm, struct i915_gtt, base);
 #ifdef __NetBSD__
 	bus_space_unmap(gtt->bst, gtt->bsh, gtt->size);
 #else
 	iounmap(gtt->gsm);
 #endif
 	free_scratch_page(vm->dev, vm->scratch_page);
+}
 static int i915_gmch_probe(struct drm_device *dev,
 			   u64 *gtt_total,
 			   size_t *stolen,
 @@ -3564,57 +3562,64 @@ i915_gem_obj_lookup_or_create_ggtt_vma(s
 	if (!vma)
 		vma = __i915_gem_vma_create(obj, ggtt, view);
 	return vma;
+}
 static struct scatterlist *
 rotate_pages(dma_addr_t *in, unsigned int offset,
 	     unsigned int width, unsigned int height,
 	     struct sg_table *st, struct scatterlist *sg)
+{
 #ifdef __NetBSD__
 	panic("XXX");
 #else
 	unsigned int column, row;
 	unsigned int src_idx;
 	if (!sg) {
 		st->nents = 0;
 		sg = st->sgl;
+	}
 	for (column = 0; column < width; column++) {
 		src_idx = width * (height - 1) + column;
 		for (row = 0; row < height; row++) {
 			st->nents++;
 			/* We don't need the pages, but need to initialize
 			 * the entries so the sg list can be happily traversed.
 			 * The only thing we need are DMA addresses.
 			 */
 			sg_set_page(sg, NULL, PAGE_SIZE, 0);
 			sg_dma_address(sg) = in[offset + src_idx];
 			sg_dma_len(sg) = PAGE_SIZE;
 			sg = sg_next(sg);
 			src_idx -= width;
+		}
+	}
 	return sg;
 #endif
+}
 static struct sg_table *
 intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view,
 			  struct drm_i915_gem_object *obj)
+{
 #ifdef __NetBSD__
 	panic("XXX");
 #else
 	struct intel_rotation_info *rot_info = &ggtt_view->rotation_info;
 	unsigned int size_pages = rot_info->size >> PAGE_SHIFT;
 	unsigned int size_pages_uv;
 	struct sg_page_iter sg_iter;
 	unsigned long i;
 	dma_addr_t *page_addr_list;
 	struct sg_table *st;
 	unsigned int uv_start_page;
 	struct scatterlist *sg;
 	int ret = -ENOMEM;
 	/* Allocate a temporary list of source pages for random access. */
 	page_addr_list = drm_malloc_ab(obj->base.size / PAGE_SIZE,
 @@ -3678,32 +3683,36 @@ intel_rotate_fb_obj_pages(struct i915_gg
 err_sg_alloc:
 	kfree(st);
 err_st_alloc:
 	drm_free_large(page_addr_list);
 	DRM_DEBUG_KMS(
 		      "Failed to create rotated mapping for object size %zu! (%d) (pitch=%u, height=%u, pixel_format=0x%x, %ux%u tiles, %u pages (%u plane 0))\n",
 		      obj->base.size, ret, rot_info->pitch, rot_info->height,
 		      rot_info->pixel_format, rot_info->width_pages,
 		      rot_info->height_pages, size_pages + size_pages_uv,
 		      size_pages);
 	return ERR_PTR(ret);
 #endif
+}
 static struct sg_table *
 intel_partial_pages(const struct i915_ggtt_view *view,
 		    struct drm_i915_gem_object *obj)
+{
 #ifdef __NetBSD__
 	panic("XXX");
 #else
 	struct sg_table *st;
 	struct scatterlist *sg;
 	struct sg_page_iter obj_sg_iter;
 	int ret = -ENOMEM;
 	st = kmalloc(sizeof(*st), GFP_KERNEL);
 	if (!st)
 		goto err_st_alloc;
 	ret = sg_alloc_table(st, view->params.partial.size, GFP_KERNEL);
 	if (ret)
 		goto err_sg_alloc;
 @@ -3719,26 +3728,27 @@ intel_partial_pages(const struct i915_gg
 		sg_dma_address(sg) = sg_page_iter_dma_address(&obj_sg_iter);
 		sg_dma_len(sg) = PAGE_SIZE;
 		sg = sg_next(sg);
 		st->nents++;
+	}
 	return st;
 err_sg_alloc:
 	kfree(st);
 err_st_alloc:
 	return ERR_PTR(ret);
 #endif
+}
 static int
 i915_get_ggtt_vma_pages(struct i915_vma *vma)
+{
 	int ret = 0;
 	if (vma->ggtt_view.pages)
 		return 0;
 	if (vma->ggtt_view.type == I915_GGTT_VIEW_NORMAL)
 		vma->ggtt_view.pages = vma->obj->pages;
 	else if (vma->ggtt_view.type == I915_GGTT_VIEW_ROTATED)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i915_gem_stolen.c,v 1.5 2018/08/27 04:58:23 riastradh Exp $	*/
+/*	$NetBSD: i915_gem_stolen.c,v 1.6 2018/08/27 06:08:25 riastradh Exp $	*/
 /*
  * Copyright © 2008-2012 Intel Corporation
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
 @@ -19,27 +19,27 @@
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
+ *
  * Authors:
  *    Eric Anholt <eric@anholt.net>
  *    Chris Wilson <chris@chris-wilson.co.uk>
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_stolen.c,v 1.5 2018/08/27 04:58:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_stolen.c,v 1.6 2018/08/27 06:08:25 riastradh Exp $");
 #include <linux/printk.h>
 #include <linux/err.h>
 #include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 #define KB(x) ((x) * 1024)
 #define MB(x) (KB(x) * 1024)
 /*
  * The BIOS typically reserves some of the system's memory for the exclusive
  * use of the integrated graphics. This memory is no longer available for
 @@ -406,27 +406,31 @@ static void bdw_get_stolen_reserved(stru
 	 * nothing reserved. */
 	if (*base == 0)
 		*size = 0;
 	else
 		*size = stolen_top - *base;
+}
 int i915_gem_init_stolen(struct drm_device *dev)
+{
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	unsigned long reserved_total, reserved_base = 0, reserved_size;
 	unsigned long stolen_top;
 #ifdef __NetBSD__
 	linux_mutex_init(&dev_priv->mm.stolen_lock);
 #else
 	mutex_init(&dev_priv->mm.stolen_lock);
 #endif
 #ifdef CONFIG_INTEL_IOMMU
 	if (intel_iommu_gfx_mapped && INTEL_INFO(dev)->gen < 8) {
 		DRM_INFO("DMAR active, disabling use of stolen memory\n");
 		return 0;
+	}
 #endif
 	if (dev_priv->gtt.stolen_size == 0)
 		return 0;
 	dev_priv->mm.stolen_base = i915_stolen_to_physical(dev);
 	if (dev_priv->mm.stolen_base == 0)
 @@ -503,26 +507,29 @@ int i915_gem_init_stolen(struct drm_devi
 	 * i915_gem_stolen_insert_node_in_range(). We may want to fix the fbcon
 	 * problem later.
 	 */
 	drm_mm_init(&dev_priv->mm.stolen, 0, dev_priv->gtt.stolen_usable_size);
 	return 0;
+}
 #ifndef __NetBSD__
 static struct sg_table *
 i915_pages_create_for_stolen(struct drm_device *dev,
 			     u32 offset, u32 size)
+{
 #ifdef __NetBSD__
 	panic("XXX");
 #else
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct sg_table *st;
 	struct scatterlist *sg;
 	DRM_DEBUG_DRIVER("offset=0x%x, size=%d\n", offset, size);
 	BUG_ON(offset > dev_priv->gtt.stolen_size - size);
 	/* We hide that we have no struct page backing our stolen object
 	 * by wrapping the contiguous physical allocation with a fake
 	 * dma mapping in a single scatterlist.
 	 */
 	st = kmalloc(sizeof(*st), GFP_KERNEL);
 @@ -532,26 +539,27 @@ i915_pages_create_for_stolen(struct drm_
 	if (sg_alloc_table(st, 1, GFP_KERNEL)) {
 		kfree(st);
 		return NULL;
+	}
 	sg = st->sgl;
 	sg->offset = 0;
 	sg->length = size;
 	sg_dma_address(sg) = (dma_addr_t)dev_priv->mm.stolen_base + offset;
 	sg_dma_len(sg) = size;
 	return st;
 #endif
+}
 #endif
 static int i915_gem_object_get_pages_stolen(struct drm_i915_gem_object *obj)
+{
 	BUG();
 	return -EINVAL;
+}
 static void i915_gem_object_put_pages_stolen(struct drm_i915_gem_object *obj)
+{
 	/* Should only be called during free */
 #ifdef __NetBSD__

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i915_gem_gtt.h,v 1.3 2018/08/27 05:35:11 riastradh Exp $	*/
+/*	$NetBSD: i915_gem_gtt.h,v 1.4 2018/08/27 06:08:25 riastradh Exp $	*/
 /*
  * Copyright © 2014 Intel Corporation
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
 @@ -425,34 +425,45 @@ struct i915_hw_ppgtt {
 	int (*switch_mm)(struct i915_hw_ppgtt *ppgtt,
 			 struct drm_i915_gem_request *req);
 	void (*debug_dump)(struct i915_hw_ppgtt *ppgtt, struct seq_file *m);
 };
 /* For each pde iterates over every pde between from start until start + length.
  * If start, and start+length are not perfectly divisible, the macro will round
  * down, and up as needed. The macro modifies pde, start, and length. Dev is
  * only used to differentiate shift values. Temp is temp.  On gen6/7, start = 0,
  * and length = 2G effectively iterates over every PDE in the system.
+ *
  * XXX: temp is not actually needed, but it saves doing the ALIGN operation.
  */
 #ifdef __NetBSD__ /* ALIGN means something else */
 #define gen6_for_each_pde(pt, pd, start, length, temp, iter) \
 	for (iter = gen6_pde_index(start); \
 	     length > 0 && iter < I915_PDES ? \
 			(pt = (pd)->page_table[iter]), 1 : 0; \
 	     iter++, \
 	     temp = round_up(start+1, 1 << GEN6_PDE_SHIFT) - start, \
 	     temp = min_t(unsigned, temp, length), \
 	     start += temp, length -= temp)
 #else
 #define gen6_for_each_pde(pt, pd, start, length, temp, iter) \
 	for (iter = gen6_pde_index(start); \
 	     length > 0 && iter < I915_PDES ? \
 			(pt = (pd)->page_table[iter]), 1 : 0; \
 	     iter++, \
 	     temp = ALIGN(start+1, 1 << GEN6_PDE_SHIFT) - start, \
 	     temp = min_t(unsigned, temp, length), \
 	     start += temp, length -= temp)
 #endif
 #define gen6_for_all_pdes(pt, ppgtt, iter)  \
 	for (iter = 0;		\
 	     pt = ppgtt->pd.page_table[iter], iter < I915_PDES;	\
 	     iter++)
 static inline uint32_t i915_pte_index(uint64_t address, uint32_t pde_shift)
+{
 	const uint32_t mask = NUM_PTE(pde_shift) - 1;
 	return (address >> PAGE_SHIFT) & mask;
+}
 @@ -491,52 +502,83 @@ static inline size_t gen6_pte_count(uint
+{
 	return i915_pte_count(addr, length, GEN6_PDE_SHIFT);
+}
 static inline uint32_t gen6_pde_index(uint32_t addr)
+{
 	return i915_pde_index(addr, GEN6_PDE_SHIFT);
+}
 /* Equivalent to the gen6 version, For each pde iterates over every pde
  * between from start until start + length. On gen8+ it simply iterates
  * over every page directory entry in a page directory.
  */
 #ifdef __NetBSD__ /* ALIGN means something else */
 #define gen8_for_each_pde(pt, pd, start, length, temp, iter)		\
 	for (iter = gen8_pde_index(start); \
 	     length > 0 && iter < I915_PDES ? \
 			(pt = (pd)->page_table[iter]), 1 : 0; \
 	     iter++,				\
 	     temp = round_up(start+1, 1 << GEN8_PDE_SHIFT) - start,	\
 	     temp = min(temp, length),					\
 	     start += temp, length -= temp)
 #define gen8_for_each_pdpe(pd, pdp, start, length, temp, iter)	\
 	for (iter = gen8_pdpe_index(start); \
 	     length > 0 && (iter < I915_PDPES_PER_PDP(dev)) ? \
 			(pd = (pdp)->page_directory[iter]), 1 : 0; \
 	     iter++,				\
 	     temp = round_up(start+1, 1 << GEN8_PDPE_SHIFT) - start,	\
 	     temp = min(temp, length),					\
 	     start += temp, length -= temp)
 #define gen8_for_each_pml4e(pdp, pml4, start, length, temp, iter)	\
 	for (iter = gen8_pml4e_index(start);	\
 	     length > 0 && iter < GEN8_PML4ES_PER_PML4 ? \
 			(pdp = (pml4)->pdps[iter]), 1 : 0; \
 	     iter++,				\
 	     temp = round_up(start+1, 1ULL << GEN8_PML4E_SHIFT) - start,	\
 	     temp = min(temp, length),					\
 	     start += temp, length -= temp)
 #else
 #define gen8_for_each_pde(pt, pd, start, length, temp, iter)		\
 	for (iter = gen8_pde_index(start); \
 	     length > 0 && iter < I915_PDES ? \
 			(pt = (pd)->page_table[iter]), 1 : 0; \
 	     iter++,				\
 	     temp = ALIGN(start+1, 1 << GEN8_PDE_SHIFT) - start,	\
 	     temp = min(temp, length),					\
 	     start += temp, length -= temp)
 #define gen8_for_each_pdpe(pd, pdp, start, length, temp, iter)	\
 	for (iter = gen8_pdpe_index(start); \
 	     length > 0 && (iter < I915_PDPES_PER_PDP(dev)) ? \
 			(pd = (pdp)->page_directory[iter]), 1 : 0; \
 	     iter++,				\
 	     temp = ALIGN(start+1, 1 << GEN8_PDPE_SHIFT) - start,	\
 	     temp = min(temp, length),					\
 	     start += temp, length -= temp)
 #define gen8_for_each_pml4e(pdp, pml4, start, length, temp, iter)	\
 	for (iter = gen8_pml4e_index(start);	\
 	     length > 0 && iter < GEN8_PML4ES_PER_PML4 ? \
 			(pdp = (pml4)->pdps[iter]), 1 : 0; \
 	     iter++,				\
 	     temp = ALIGN(start+1, 1ULL << GEN8_PML4E_SHIFT) - start,	\
 	     temp = min(temp, length),					\
 	     start += temp, length -= temp)
 #endif
 static inline uint32_t gen8_pte_index(uint64_t address)
+{
 	return i915_pte_index(address, GEN8_PDE_SHIFT);
+}
 static inline uint32_t gen8_pde_index(uint64_t address)
+{
 	return i915_pde_index(address, GEN8_PDE_SHIFT);
+}
 static inline uint32_t gen8_pdpe_index(uint64_t address)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i915_gpu_error.c,v 1.6 2018/08/27 05:57:29 riastradh Exp $	*/
+/*	$NetBSD: i915_gpu_error.c,v 1.7 2018/08/27 06:08:25 riastradh Exp $	*/
 /*
  * Copyright (c) 2008 Intel Corporation
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
 @@ -20,27 +20,27 @@
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
+ *
  * Authors:
  *    Eric Anholt <eric@anholt.net>
  *    Keith Packard <keithp@keithp.com>
  *    Mika Kuoppala <mika.kuoppala@intel.com>
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gpu_error.c,v 1.6 2018/08/27 05:57:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gpu_error.c,v 1.7 2018/08/27 06:08:25 riastradh Exp $");
 #include <sys/param.h>
 #include <asm/io.h>
 #include <linux/irqflags.h>
 #include "i915_drv.h"
 static const char *ring_str(int ring)
+{
 	switch (ring) {
 	case RCS: return "render";
 	case VCS: return "bsd";
 	case BCS: return "blt";
 @@ -345,27 +345,27 @@ int i915_error_state_to_str(struct drm_i
 	struct drm_i915_error_state *error = error_priv->error;
 	struct drm_i915_error_object *obj;
 	int i, j, offset, elt;
 	int max_hangcheck_score;
 	if (!error) {
 		err_printf(m, "no error state collected\n");
 		goto out;
+	}
 	err_printf(m, "%s\n", error->error_msg);
 	err_printf(m, "Time: %"PRIdMAX" s %ld us\n", (intmax_t)error->time.tv_sec,
 		   (long)error->time.tv_usec);
-	err_printf(m, "Kernel: " __NetBSD_Version__ "\n");
+	err_printf(m, "Kernel: %d\n", __NetBSD_Version__);
 	err_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
 		   error->time.tv_usec);
 	max_hangcheck_score = 0;
 	for (i = 0; i < ARRAY_SIZE(error->ring); i++) {
 		if (error->ring[i].hangcheck_score > max_hangcheck_score)
 			max_hangcheck_score = error->ring[i].hangcheck_score;
+	}
 	for (i = 0; i < ARRAY_SIZE(error->ring); i++) {
 		if (error->ring[i].hangcheck_score == max_hangcheck_score &&
 		    error->ring[i].pid != -1) {
 			err_printf(m, "Active process (on ring %s): %s [%d]\n",
 				   ring_str(i),
 				   error->ring[i].comm,

 @@ -1,14 +1,14 @@
-/*	$OpenBSD: drm_linux.h,v 1.89 2018/06/25 22:29:16 kettenis Exp $	*/
+/*	$OpenBSD$	*/
 /*
  * Copyright (c) 2013, 2014, 2015 Mark Kettenis
  * Copyright (c) 2017 Martin Pieuchot
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 @@ -48,18 +48,14 @@ __hash_empty(struct list_head *table, u_
 #define __hash(table, key)	&table[key % (nitems(table) - 1)]
 #define hash_init(table)	__hash_init(table, nitems(table))
 #define hash_add(table, node, key) \
 	hlist_add_head(node, __hash(table, key))
 #define hash_del(node)		hlist_del_init(node)
 #define hash_empty(table)	__hash_empty(table, nitems(table))
 #define hash_for_each_possible(table, obj, member, key) \
 	hlist_for_each_entry(obj, __hash(table, key), member)
 #define hash_for_each_safe(table, i, tmp, obj, member) 	\
 	for (i = 0; i < nitems(table); i++)		\
 	       list_for_each_entry_safe(obj, tmp, &table[i], member)
 #define DECLARE_HASHTABLE(__a,__b) \
 	uint64_t __a /* XXX */
 #endif /*_LINUX_HASHTABLE_H_*/

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kernel.h,v 1.11 2018/08/27 06:07:20 riastradh Exp $	*/
+/*	$NetBSD: kernel.h,v 1.12 2018/08/27 06:08:25 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.
 @@ -30,26 +30,30 @@
  */
 #ifndef _LINUX_KERNEL_H_
 #define _LINUX_KERNEL_H_
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <lib/libkern/libkern.h>
 #include <linux/printk.h>
 #define U16_MAX UINT16_MAX
 #define U32_MAX UINT32_MAX
 #define U64_MAX UINT64_MAX
 #define	oops_in_progress	(panicstr != NULL)
 #define	IS_ENABLED(option)	(option)
 #define	IS_BUILTIN(option)	(1) /* Probably... */
 #define	__printf	__printflike
 #define	__user
 #define	__must_check	/* __attribute__((warn_unused_result)), if GCC */
 #define	__always_unused	__unused
 #define	barrier()	__insn_barrier()
 #define	likely(X)	__predict_true(X)
 #define	unlikely(X)	__predict_false(X)