summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/com.c4
-rw-r--r--sys/dev/ic/cy.c4
-rw-r--r--sys/dev/ic/z8530tty.c4
-rw-r--r--sys/dev/pci/cz.c4
-rw-r--r--sys/dev/sbus/magma.c4
-rw-r--r--sys/dev/sbus/spif.c4
-rw-r--r--sys/dev/usb/ucom.c4
-rw-r--r--sys/dev/wscons/wsdisplay.c4
8 files changed, 16 insertions, 16 deletions
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 83bce029147..28369ca10fa 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com.c,v 1.140 2010/06/28 04:36:31 ckuethe Exp $ */
+/* $OpenBSD: com.c,v 1.141 2010/06/28 14:13:32 deraadt Exp $ */
/* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
/*
@@ -286,7 +286,7 @@ comopen(dev_t dev, int flag, int mode, struct proc *p)
s = spltty();
if (!sc->sc_tty) {
- tp = sc->sc_tty = ttymalloc();
+ tp = sc->sc_tty = ttymalloc(1000000);
} else
tp = sc->sc_tty;
splx(s);
diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c
index 5f6fddbba4f..3280a72a846 100644
--- a/sys/dev/ic/cy.c
+++ b/sys/dev/ic/cy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cy.c,v 1.30 2010/06/26 23:24:44 guenther Exp $ */
+/* $OpenBSD: cy.c,v 1.31 2010/06/28 14:13:32 deraadt Exp $ */
/*
* Copyright (c) 1996 Timo Rossi.
* All rights reserved.
@@ -299,7 +299,7 @@ cyopen(dev, flag, mode, p)
s = spltty();
if (cy->cy_tty == NULL) {
- cy->cy_tty = ttymalloc();
+ cy->cy_tty = ttymalloc(0);
}
splx(s);
diff --git a/sys/dev/ic/z8530tty.c b/sys/dev/ic/z8530tty.c
index 2206573686d..890ca335712 100644
--- a/sys/dev/ic/z8530tty.c
+++ b/sys/dev/ic/z8530tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530tty.c,v 1.21 2010/04/12 12:57:52 tedu Exp $ */
+/* $OpenBSD: z8530tty.c,v 1.22 2010/06/28 14:13:33 deraadt Exp $ */
/* $NetBSD: z8530tty.c,v 1.13 1996/10/16 20:42:14 gwr Exp $ */
/*
@@ -254,7 +254,7 @@ zstty_attach(parent, self, aux)
}
printf("\n");
- tp = ttymalloc();
+ tp = ttymalloc(0);
tp->t_dev = dev;
tp->t_oproc = zsstart;
tp->t_param = zsparam;
diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c
index 6ba9554e252..99befa0d60e 100644
--- a/sys/dev/pci/cz.c
+++ b/sys/dev/pci/cz.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cz.c,v 1.16 2010/04/12 12:57:52 tedu Exp $ */
+/* $OpenBSD: cz.c,v 1.17 2010/06/28 14:13:33 deraadt Exp $ */
/* $NetBSD: cz.c,v 1.15 2001/01/20 19:10:36 thorpej Exp $ */
/*-
@@ -418,7 +418,7 @@ cz_attach(parent, self, aux)
timeout_set(&sc->sc_diag_to, cztty_diag, sc);
- tp = ttymalloc();
+ tp = ttymalloc(0);
tp->t_dev = makedev(cztty_major,
(cz->cz_dev.dv_unit * ZFIRM_MAX_CHANNELS) + i);
tp->t_oproc = czttystart;
diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c
index 87d831c5f6d..54a3be568e1 100644
--- a/sys/dev/sbus/magma.c
+++ b/sys/dev/sbus/magma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: magma.c,v 1.21 2010/04/12 12:57:52 tedu Exp $ */
+/* $OpenBSD: magma.c,v 1.22 2010/06/28 14:13:34 deraadt Exp $ */
/*-
* Copyright (c) 1998 Iain Hibbert
@@ -805,7 +805,7 @@ mtty_attach(struct device *parent, struct device *dev, void *args)
}
mp->mp_channel = chan;
- tp = ttymalloc();
+ tp = ttymalloc(0);
tp->t_oproc = mtty_start;
tp->t_param = mtty_param;
diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c
index db6c09075a5..75d88e5d9e1 100644
--- a/sys/dev/sbus/spif.c
+++ b/sys/dev/sbus/spif.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spif.c,v 1.17 2010/04/12 12:57:52 tedu Exp $ */
+/* $OpenBSD: spif.c,v 1.18 2010/06/28 14:13:34 deraadt Exp $ */
/*
* Copyright (c) 1999-2002 Jason L. Wright (jason@thought.net)
@@ -304,7 +304,7 @@ sttyattach(parent, dev, aux)
DTR_WRITE(sc, port, 0);
- tp = ttymalloc();
+ tp = ttymalloc(0);
tp->t_oproc = stty_start;
tp->t_param = stty_param;
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index ead332cd742..eae70ed4ec8 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ucom.c,v 1.47 2010/04/12 12:57:52 tedu Exp $ */
+/* $OpenBSD: ucom.c,v 1.48 2010/06/28 14:13:35 deraadt Exp $ */
/* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */
/*
@@ -203,7 +203,7 @@ ucom_attach(struct device *parent, struct device *self, void *aux)
sc->sc_parent = uca->arg;
sc->sc_portno = uca->portno;
- tp = ttymalloc();
+ tp = ttymalloc(1000000);
tp->t_oproc = ucomstart;
tp->t_param = ucomparam;
sc->sc_tty = tp;
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index 62663eea3e9..4682d8aaa1e 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.99 2010/04/12 12:57:52 tedu Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.100 2010/06/28 14:13:35 deraadt Exp $ */
/* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
/*
@@ -310,7 +310,7 @@ wsscreen_attach(struct wsdisplay_softc *sc, int console, const char *emul,
}
scr->scr_dconf = dconf;
- scr->scr_tty = ttymalloc();
+ scr->scr_tty = ttymalloc(0);
scr->sc = sc;
return (scr);