git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfs2
[pandora-kernel.git]
/
arch
/
um
/
drivers
/
random.c
diff --git
a/arch/um/drivers/random.c
b/arch/um/drivers/random.c
index
f9e2219
..
ae99094
100644
(file)
--- a/
arch/um/drivers/random.c
+++ b/
arch/um/drivers/random.c
@@
-58,10
+58,8
@@
static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,
if (filp->f_flags & O_NONBLOCK)
return ret ? : -EAGAIN;
if (filp->f_flags & O_NONBLOCK)
return ret ? : -EAGAIN;
- if(need_resched()){
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(1);
- }
+ if(need_resched())
+ schedule_timeout_interruptible(1);
}
else return n;
if (signal_pending (current))
}
else return n;
if (signal_pending (current))
@@
-70,7
+68,7
@@
static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,
return ret;
}
return ret;
}
-static struct file_operations rng_chrdev_ops = {
+static
const
struct file_operations rng_chrdev_ops = {
.owner = THIS_MODULE,
.open = rng_dev_open,
.read = rng_dev_read,
.owner = THIS_MODULE,
.open = rng_dev_open,
.read = rng_dev_read,