diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-05-06 17:51:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:13:03 -0400 |
commit | fda83a99b2b49016b9d7ed562745969db25c4ef9 (patch) | |
tree | 45b6282e98841b8d608523a1df57d4a4c51c6965 /arch/um/kernel | |
parent | 77f6af778dc23514d897f4fdc7935329285ecb1b (diff) |
uml: change remaining callers of os_{read_write}_file
Convert all remaining os_{read_write}_file users to use the simple
{read,write} wrappers, os_{read_write}_file_k.
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/kernel')
-rw-r--r-- | arch/um/kernel/initrd.c | 2 | ||||
-rw-r--r-- | arch/um/kernel/physmem.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c index 6ab1539108e1..bf3dd9659865 100644 --- a/arch/um/kernel/initrd.c +++ b/arch/um/kernel/initrd.c | |||
@@ -55,7 +55,7 @@ int load_initrd(char *filename, void *buf, int size) | |||
55 | printk("Opening '%s' failed - err = %d\n", filename, -fd); | 55 | printk("Opening '%s' failed - err = %d\n", filename, -fd); |
56 | return(-1); | 56 | return(-1); |
57 | } | 57 | } |
58 | n = os_read_file(fd, buf, size); | 58 | n = os_read_file_k(fd, buf, size); |
59 | if(n != size){ | 59 | if(n != size){ |
60 | printk("Read of %d bytes from '%s' failed, err = %d\n", size, | 60 | printk("Read of %d bytes from '%s' failed, err = %d\n", size, |
61 | filename, -n); | 61 | filename, -n); |
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c index a9856209006b..77021a627da6 100644 --- a/arch/um/kernel/physmem.c +++ b/arch/um/kernel/physmem.c | |||
@@ -211,7 +211,7 @@ void physmem_forget_descriptor(int fd) | |||
211 | panic("physmem_forget_descriptor - failed to seek " | 211 | panic("physmem_forget_descriptor - failed to seek " |
212 | "to %lld in fd %d, error = %d\n", | 212 | "to %lld in fd %d, error = %d\n", |
213 | offset, fd, -err); | 213 | offset, fd, -err); |
214 | err = os_read_file(fd, addr, PAGE_SIZE); | 214 | err = os_read_file_k(fd, addr, PAGE_SIZE); |
215 | if(err < 0) | 215 | if(err < 0) |
216 | panic("physmem_forget_descriptor - failed to read " | 216 | panic("physmem_forget_descriptor - failed to read " |
217 | "from fd %d to 0x%p, error = %d\n", | 217 | "from fd %d to 0x%p, error = %d\n", |