From 09cdf1daa9a4e195cd63edcedebf8c24b9e0b526 Mon Sep 17 00:00:00 2001
From: rtr <rtr@NetBSD.org>
Date: Sun, 6 Jul 2014 15:44:25 +0000
Subject: [PATCH] * #include <sys/kmem.h> for kmem_intr_xxx() * ansify
 pcb_add() function signature and make its prototype parameter   types match
 its definition.

---
 sys/netnatm/natm.h     |  4 ++--
 sys/netnatm/natm_pcb.c | 15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h
index e1e0f8bceaee..7a572cc6823f 100644
--- a/sys/netnatm/natm.h
+++ b/sys/netnatm/natm.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: natm.h,v 1.13 2014/05/19 02:51:25 rmind Exp $	*/
+/*	$NetBSD: natm.h,v 1.14 2014/07/06 15:44:25 rtr Exp $	*/
 
 /*
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -133,7 +133,7 @@ struct atm_rawioctl {
 /* natm_pcb.c */
 struct	natmpcb *npcb_alloc(bool);
 void	npcb_free(struct natmpcb *, int);
-struct	natmpcb *npcb_add(struct natmpcb *, struct ifnet *, int, int);
+struct	natmpcb *npcb_add(struct natmpcb *, struct ifnet *, u_int16_t, u_int8_t);
 
 /* natm.c */
 int	natm0_sysctl(int *, u_int, void *, size_t *, void *, size_t);
diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c
index 27af18024bd8..08af0890434f 100644
--- a/sys/netnatm/natm_pcb.c
+++ b/sys/netnatm/natm_pcb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: natm_pcb.c,v 1.15 2014/05/19 02:51:25 rmind Exp $	*/
+/*	$NetBSD: natm_pcb.c,v 1.16 2014/07/06 15:44:25 rtr Exp $	*/
 
 /*
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -31,11 +31,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: natm_pcb.c,v 1.15 2014/05/19 02:51:25 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: natm_pcb.c,v 1.16 2014/07/06 15:44:25 rtr Exp $");
 
 #include "opt_ddb.h"
 
 #include <sys/param.h>
+#include <sys/kmem.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
@@ -98,13 +99,9 @@ npcb_free(struct natmpcb *npcb, int op)
  *   returns npcb if ok
  */
 
-struct natmpcb *npcb_add(npcb, ifp, vci, vpi)
-
-struct natmpcb *npcb;
-struct ifnet *ifp;
-u_int16_t vci;
-u_int8_t vpi;
-
+struct natmpcb *
+npcb_add(struct natmpcb *npcb, struct ifnet *ifp,
+	u_int16_t vci, u_int8_t vpi)
 {
   struct natmpcb *cpcb = NULL;		/* current pcb */
   int s = splnet();