diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-05-06 23:51:43 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 21:13:03 +0200 |
commit | a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c (patch) | |
tree | 4a747a92c9bd7a8703004603ee9e91f8bfb7e95a /arch/um/kernel/initrd.c | |
parent | uml: remove debugging remnants (diff) | |
download | linux-a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c.tar.xz linux-a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c.zip |
uml: rename os_{read_write}_file_k back to os_{read_write}_file
Rename os_{read_write}_file_k back to os_{read_write}_file, delete
the originals and their bogus infrastructure, and fix all the callers.
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/initrd.c')
-rw-r--r-- | arch/um/kernel/initrd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c index cff73faae991..16dc43e9d940 100644 --- a/arch/um/kernel/initrd.c +++ b/arch/um/kernel/initrd.c @@ -63,7 +63,7 @@ int load_initrd(char *filename, void *buf, int size) printk("Opening '%s' failed - err = %d\n", filename, -fd); return -1; } - n = os_read_file_k(fd, buf, size); + n = os_read_file(fd, buf, size); if(n != size){ printk("Read of %d bytes from '%s' failed, err = %d\n", size, filename, -n); |