summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authordg <dg@FreeBSD.org>1993-10-18 14:21:48 +0000
committerdg <dg@FreeBSD.org>1993-10-18 14:21:48 +0000
commit805ad5a7aa504a0f8f8970818abde5eb548f57ad (patch)
tree9e29b77fd4cc1d814a0529041361c34e15edf428 /sys/kern
parent0ad470ab1700385cdc238de270f5c28fe2656a1b (diff)
downloadFreeBSD-src-805ad5a7aa504a0f8f8970818abde5eb548f57ad.zip
FreeBSD-src-805ad5a7aa504a0f8f8970818abde5eb548f57ad.tar.gz
Yank out Christoph Robitschko's hack for the hanging console problem as
it didn't actually fix it, and because starting the getty on /dev/console instead of /dev/vga is a good work-around.
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/tty_cons.c27
1 files changed, 2 insertions, 25 deletions
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index eae9ffc..2e92a9c 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: @(#)cons.c 7.2 (Berkeley) 5/9/91
- * $Id$
+ * $Id: cons.c,v 1.3 1993/10/16 14:14:49 rgrimes Exp $
*/
@@ -49,7 +49,6 @@
#include "sys/tty.h"
#include "sys/file.h"
#include "sys/conf.h"
-#include "sys/vnode.h"
#include "cons.h"
@@ -99,25 +98,14 @@ cninit()
(*cp->cn_init)(cp);
}
-static struct vnode *cnopenvp = NULLVP;
-
-
cnopen(dev, flag, mode, p)
dev_t dev;
int flag, mode;
struct proc *p;
{
- int error;
-
-
if (cn_tab == NULL)
return (0);
dev = cn_tab->cn_dev;
- if (cnopenvp == NULLVP)
- if ((error = getdevvp(dev, &cnopenvp, VCHR))) {
- printf("cnopen: getdevvp returned %d !\n", error);
- return(error);
- }
return ((*cdevsw[major(dev)].d_open)(dev, flag, mode, p));
}
@@ -126,21 +114,10 @@ cnclose(dev, flag, mode, p)
int flag, mode;
struct proc *p;
{
- int error;
-
-
if (cn_tab == NULL)
return (0);
dev = cn_tab->cn_dev;
- if (vcount(cnopenvp) <= 1)
- error = (*cdevsw[major(dev)].d_close)(dev, flag, mode, p);
- else
- error = 0;
- if (error == 0) {
- vrele(cnopenvp);
- cnopenvp = NULLVP;
- return(error);
- }
+ return ((*cdevsw[major(dev)].d_close)(dev, flag, mode, p));
}
cnread(dev, uio, flag)
OpenPOWER on IntegriCloud