diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-17 07:05:43 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-17 07:05:43 +0200 |
commit | 803db244b9f71102e366fd689000c1417b9a7508 (patch) | |
tree | 2fe1abfd16cded8074905b6b91d9d1943e15325e /drivers/char/hvc_console.c | |
parent | [PATCH] s390: qeth driver fixes [6/6] (diff) | |
parent | [PATCH] i386/x86-64: Add core 2 to oprofile (diff) | |
download | linux-803db244b9f71102e366fd689000c1417b9a7508.tar.xz linux-803db244b9f71102e366fd689000c1417b9a7508.zip |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/char/hvc_console.c')
-rw-r--r-- | drivers/char/hvc_console.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index ca2f538e549e..613d67f1c7f0 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c @@ -668,6 +668,7 @@ int khvcd(void *unused) do { poll_mask = 0; hvc_kicked = 0; + try_to_freeze(); wmb(); if (cpus_empty(cpus_in_xmon)) { spin_lock(&hvc_structs_lock); |