summaryrefslogtreecommitdiffstats
path: root/drivers/char/hvc_console.c
diff options
context:
space:
mode:
authorSteven Whitehouse2006-09-21 16:18:14 +0200
committerSteven Whitehouse2006-09-21 16:18:14 +0200
commit91fa47964165a42401fbc1f41caa63ab78564305 (patch)
tree8f4ffdcbdedd845563630c3bcacd9407c75ccb52 /drivers/char/hvc_console.c
parent[GFS2] Remove unused constants (diff)
parentLinux v2.6.18. Arrr! (diff)
downloadkernel-qcow2-linux-91fa47964165a42401fbc1f41caa63ab78564305.tar.gz
kernel-qcow2-linux-91fa47964165a42401fbc1f41caa63ab78564305.tar.xz
kernel-qcow2-linux-91fa47964165a42401fbc1f41caa63ab78564305.zip
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/char/hvc_console.c')
-rw-r--r--drivers/char/hvc_console.c1
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);