d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quick fix for previous commit: don't free zbuf on close since it may be

Browse Source 
in use in another process that blocked in uiomove().
This commit is contained in:
bde 1996-07-15 05:23:04 +00:00
parent 4df49241b6
commit 7af02d30b3
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/amd64/amd64/mem.c
View File

@ -38,7 +38,7 @@
*
* from: Utah $Hdr: mem.c 1.13 89/10/08$
* from: @(#)mem.c 7.2 (Berkeley) 5/9/91
* $Id: mem.c,v 1.34 1996/05/02 10:43:05 phk Exp $
* $Id: mem.c,v 1.35 1996/07/14 06:05:53 dyson Exp $
*/
/*
@ -99,6 +99,7 @@ static void *io_devfs_token;
static void *perfmon_devfs_token;
#endif
static caddr_t zbuf;
static void memdevfs_init __P((void));
@ -135,7 +136,6 @@ memdevfs_init()
#endif /* DEVFS */
extern char *ptvmmap; /* poor name! */
caddr_t zbuf;
static int
mmclose(dev, flags, fmt, p)
@ -155,12 +155,6 @@ mmclose(dev, flags, fmt, p)
fp = (struct trapframe *)curproc->p_md.md_regs;
fp->tf_eflags &= ~PSL_IOPL;
break;
case 12:
if (zbuf) {
free(zbuf, M_TEMP);
zbuf = NULL;
}
default:
break;
}
@ -187,7 +181,6 @@ mmopen(dev, flags, fmt, p)
fp = (struct trapframe *)curproc->p_md.md_regs;
fp->tf_eflags |= PSL_IOPL;
break;
default:
break;
}

11
sys/i386/i386/mem.c
View File

@ -38,7 +38,7 @@
*
* from: Utah $Hdr: mem.c 1.13 89/10/08$
* from: @(#)mem.c 7.2 (Berkeley) 5/9/91
* $Id: mem.c,v 1.34 1996/05/02 10:43:05 phk Exp $
* $Id: mem.c,v 1.35 1996/07/14 06:05:53 dyson Exp $
*/
/*
@ -99,6 +99,7 @@ static void *io_devfs_token;
static void *perfmon_devfs_token;
#endif
static caddr_t zbuf;
static void memdevfs_init __P((void));
@ -135,7 +136,6 @@ memdevfs_init()
#endif /* DEVFS */
extern char *ptvmmap; /* poor name! */
caddr_t zbuf;
static int
mmclose(dev, flags, fmt, p)
@ -155,12 +155,6 @@ mmclose(dev, flags, fmt, p)
fp = (struct trapframe *)curproc->p_md.md_regs;
fp->tf_eflags &= ~PSL_IOPL;
break;
case 12:
if (zbuf) {
free(zbuf, M_TEMP);
zbuf = NULL;
}
default:
break;
}
@ -187,7 +181,6 @@ mmopen(dev, flags, fmt, p)
fp = (struct trapframe *)curproc->p_md.md_regs;
fp->tf_eflags |= PSL_IOPL;
break;
default:
break;
}