[src/trunk]: src/sys/netnatm * #include <sys/kmem.h> for kmem_intr_xxx()

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

details:   https://anonhg.NetBSD.org/src/rev/bb4dc397c2f4
branches:  trunk
changeset: 330367:bb4dc397c2f4
user:      rtr <rtr%NetBSD.org@localhost>
date:      Sun Jul 06 15:44:25 2014 +0000

description:
* #include <sys/kmem.h> for kmem_intr_xxx()
* ansify pcb_add() function signature and make its prototype parameter
  types match its definition.

diffstat:

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

diffs (58 lines):

diff -r 4aed58a72bab -r bb4dc397c2f4 sys/netnatm/natm.h
--- a/sys/netnatm/natm.h        Sun Jul 06 15:43:55 2014 +0000
+++ b/sys/netnatm/natm.h        Sun Jul 06 15:44:25 2014 +0000
@@ -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 @@
 /* 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 -r 4aed58a72bab -r bb4dc397c2f4 sys/netnatm/natm_pcb.c
--- a/sys/netnatm/natm_pcb.c    Sun Jul 06 15:43:55 2014 +0000
+++ b/sys/netnatm/natm_pcb.c    Sun Jul 06 15:44:25 2014 +0000
@@ -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 @@
  *   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();