diff options
Diffstat (limited to 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 3d409f2d5..1070e5097 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -96,7 +96,7 @@ asmlinkage int sys_syslog(int type, char * buf, int len) cli(); error = -ERESTARTSYS; while (!log_size) { - if (current->signal & ~current->blocked) { + if (signal_pending(current)) { sti(); goto out; } @@ -109,7 +109,7 @@ asmlinkage int sys_syslog(int type, char * buf, int len) log_size--; log_start &= LOG_BUF_LEN-1; sti(); - put_user(c,buf); + __put_user(c,buf); buf++; i++; cli(); @@ -138,7 +138,7 @@ asmlinkage int sys_syslog(int type, char * buf, int len) j = log_start + log_size - count; for (i = 0; i < count; i++) { c = *((char *) log_buf+(j++ & (LOG_BUF_LEN-1))); - put_user(c, buf++); + __put_user(c, buf++); } if (do_clear) logged_chars = 0; |