diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-05-06 14:51:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:13:03 -0700 |
commit | ef0470c053274c343b2be8737e0146d65e17f9be (patch) | |
tree | 68809a8af1da35e3bb3530a667eea080e086fae0 /arch/um/os-Linux/sigio.c | |
parent | 3d564047a5f45cb628ec72514f68076e532988f3 (diff) | |
download | kernel_samsung_crespo-ef0470c053274c343b2be8737e0146d65e17f9be.zip kernel_samsung_crespo-ef0470c053274c343b2be8737e0146d65e17f9be.tar.gz kernel_samsung_crespo-ef0470c053274c343b2be8737e0146d65e17f9be.tar.bz2 |
uml: tidy libc code
This patch lays some groundwork for the next one, which converts calls to
os_{read,write}_file into {read,write}, by doing some tidying in the affected
areas.
do_not_aio gets restructured to make the final result a bit cleaner.
There are also whitespace and other formatting fixes, fixes in error messages,
and a typo fix.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/os-Linux/sigio.c')
-rw-r--r-- | arch/um/os-Linux/sigio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c index f77ce3d..8ccf6a3 100644 --- a/arch/um/os-Linux/sigio.c +++ b/arch/um/os-Linux/sigio.c @@ -461,15 +461,16 @@ static void tty_output(int master, int slave) while(os_write_file(master, buf, sizeof(buf)) > 0) ; if(errno != EAGAIN) - panic("check_sigio : write failed, errno = %d\n", errno); + panic("tty_output : write failed, errno = %d\n", errno); while(((n = os_read_file(slave, buf, sizeof(buf))) > 0) && !got_sigio) ; if(got_sigio){ printk("Yes\n"); pty_output_sigio = 1; } - else if(n == -EAGAIN) printk("No, enabling workaround\n"); - else panic("check_sigio : read failed, err = %d\n", n); + else if(n == -EAGAIN) + printk("No, enabling workaround\n"); + else panic("tty_output : read failed, err = %d\n", n); } static void tty_close(int master, int slave) |