talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try a no-wait malloc first in clist_alloc_cblocks(). If this fails, then 

complain and blunder on.

Should be in 2.2, preferably with a better fix.
This commit is contained in:
Bruce Evans 1997-03-05 16:45:01 +00:00
parent a5c1768dd5
commit c68fa33937
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/subr_clist.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: tty_subr.c,v 1.25 1997/02/22 09:39:26 peter Exp $
*/
/*
@ -131,7 +131,12 @@ cblock_alloc_cblocks(number)
struct cblock *cbp;
for (i = 0; i < number; ++i) {
cbp = malloc(sizeof *cbp, M_TTYS, M_WAITOK);
cbp = malloc(sizeof *cbp, M_TTYS, M_NOWAIT);
if (cbp == NULL) {
printf(
"clist_alloc_cblocks: M_NOWAIT malloc failed, trying M_WAITOK\n");
cbp = malloc(sizeof *cbp, M_TTYS, M_WAITOK);
}
/*
* Freed cblocks have zero quotes and garbage elsewhere.
* Set the may-have-quote bit to force zeroing the quotes.

9
sys/kern/tty_subr.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: tty_subr.c,v 1.25 1997/02/22 09:39:26 peter Exp $
*/
/*
@ -131,7 +131,12 @@ cblock_alloc_cblocks(number)
struct cblock *cbp;
for (i = 0; i < number; ++i) {
cbp = malloc(sizeof *cbp, M_TTYS, M_WAITOK);
cbp = malloc(sizeof *cbp, M_TTYS, M_NOWAIT);
if (cbp == NULL) {
printf(
"clist_alloc_cblocks: M_NOWAIT malloc failed, trying M_WAITOK\n");
cbp = malloc(sizeof *cbp, M_TTYS, M_WAITOK);
}
/*
* Freed cblocks have zero quotes and garbage elsewhere.
* Set the may-have-quote bit to force zeroing the quotes.