aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/random.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-05-06 17:51:43 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 15:13:03 -0400
commita6ea4cceed18edebe1eb6001cb9e0f88cd741a6c (patch)
tree4a747a92c9bd7a8703004603ee9e91f8bfb7e95a /arch/um/drivers/random.c
parenta263672424e591067e42e1d8371e56927fe73af8 (diff)
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/drivers/random.c')
-rw-r--r--arch/um/drivers/random.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c
index 94838f4c1645..e942e836f995 100644
--- a/arch/um/drivers/random.c
+++ b/arch/um/drivers/random.c
@@ -44,7 +44,7 @@ static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,
44 int n, ret = 0, have_data; 44 int n, ret = 0, have_data;
45 45
46 while(size){ 46 while(size){
47 n = os_read_file_k(random_fd, &data, sizeof(data)); 47 n = os_read_file(random_fd, &data, sizeof(data));
48 if(n > 0){ 48 if(n > 0){
49 have_data = n; 49 have_data = n;
50 while (have_data && size) { 50 while (have_data && size) {