>Number:         10603
>Category:       port-hp300
>Synopsis:       hp300 kernel is uncompilable
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    port-hp300-maintainer
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jul 15 22:41:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Steve Peurifoy
>Release:        1.5 ALPHA (20000712)
>Organization:
>Environment:
NetBSD loop.home 1.5_ALPHA NetBSD 1.5_ALPHA (loop) #0: Wed Jun 28 03:37:23 MDT 2000     swp@loop:/usr/src/sys/arch/hp300/compile/loop hp300


>Description:
	There are three source files with problems.  Two are a result of
	recent changes.  The other is older but only shows up if DEBUG
	is defined.  The files are:

	sys/arch/hp300/dev/grfvar.h
	sys/arch/hp300/dev/sd.c
	sys/arch/hp300/hp300/mem.c

>How-To-Repeat:
	Build a DEBUG kernel

>Fix:

Index: grfvar.h
===================================================================
RCS file: /cvs/src/sys/arch/hp300/dev/grfvar.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** grfvar.h	2000/07/14 17:37:51	1.4
--- grfvar.h	2000/07/16 04:38:18	1.5
***************
*** 140,146 ****
  int	grfunmap __P((dev_t, caddr_t, struct proc *));
  int	grfon __P((dev_t));
  int	grfoff __P((dev_t));
! off_t	grfaddr __P((struct grf_softc *, off_t));
  int	grffindproc __P((struct proc *, struct grf_data *));
  void	grfrmproc __P((struct proc *, struct grf_data *));
  
--- 140,146 ----
  int	grfunmap __P((dev_t, caddr_t, struct proc *));
  int	grfon __P((dev_t));
  int	grfoff __P((dev_t));
! paddr_t	grfaddr __P((struct grf_softc *, off_t));
  int	grffindproc __P((struct proc *, struct grf_data *));
  void	grfrmproc __P((struct proc *, struct grf_data *));

  
Index: sd.c
===================================================================
RCS file: /cvs/src/sys/arch/hp300/dev/sd.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** sd.c	2000/06/26 05:56:36	1.17
--- sd.c	2000/07/16 05:08:49	1.18
***************
*** 1007,1013 ****
  		printf("%s: sdstart: %s adr %p blk %ld len %ld ecnt %d\n",
  		       sc->sc_dev.dv_xname,
  		       bp->b_flags & B_READ? "read" : "write",
! 		       bp->b_data, bp->b_rawblkno, bp->b_bcount,
  		       sc->sc_errcnt);
  #endif
  	bp->b_flags |= B_ERROR;
--- 1007,1013 ----
  		printf("%s: sdstart: %s adr %p blk %ld len %ld ecnt %d\n",
  		       sc->sc_dev.dv_xname,
  		       bp->b_flags & B_READ? "read" : "write",
! 		       bp->b_data, (long)bp->b_rawblkno, bp->b_bcount,
  		       sc->sc_errcnt);
  #endif
  	bp->b_flags |= B_ERROR;


Index: mem.c
===================================================================
RCS file: /cvs/src/sys/arch/hp300/hp300/mem.c,v
retrieving revision 1.1.1.6
retrieving revision 1.2
diff -c -r1.1.1.6 -r1.2
*** mem.c	2000/07/14 05:50:53	1.1.1.6
--- mem.c	2000/07/16 05:26:35	1.2
***************
*** 68,76 ****
  
  /*ARGSUSED*/
  int
! mmopen(dev, flag, mode)
  	dev_t dev;
  	int flag, mode;
  {
  
  	return (0);
--- 68,77 ----
  
  /*ARGSUSED*/
  int
! mmopen(dev, flag, mode, p)
  	dev_t dev;
  	int flag, mode;
+ 	struct proc *p;
  {
  
  	return (0);
***************
*** 78,86 ****
  
  /*ARGSUSED*/
  int
! mmclose(dev, flag, mode)
  	dev_t dev;
  	int flag, mode;
  {
  
  	return (0);
--- 79,88 ----
  
  /*ARGSUSED*/
  int
! mmclose(dev, flag, mode, p)
  	dev_t dev;
  	int flag, mode;
+ 	struct proc *p;
  {
  
  	return (0);

>Release-Note:
>Audit-Trail:
>Unformatted: