diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
| commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
| tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /kernel/printk.c | |
| parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) | |
Merge with Linux 2.2.8.
Diffstat (limited to 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index a333fe18e..36414fcf3 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -137,15 +137,9 @@ int do_syslog(int type, char * buf, int len) error = verify_area(VERIFY_WRITE,buf,len); if (error) goto out; - cli(); - error = -ERESTARTSYS; - while (!log_size) { - if (signal_pending(current)) { - sti(); - goto out; - } - interruptible_sleep_on(&log_wait); - } + error = wait_event_interruptible(log_wait, log_size); + if (error) + goto out; i = 0; while (log_size && i < len) { c = *((char *) log_buf+log_start); |