Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
char
/
snsc.c
diff --git
a/kernel/drivers/char/snsc.c
b/kernel/drivers/char/snsc.c
index
8bab592
..
94006f9
100644
(file)
--- a/
kernel/drivers/char/snsc.c
+++ b/
kernel/drivers/char/snsc.c
@@
-19,7
+19,7
@@
#include <linux/sched.h>
#include <linux/device.h>
#include <linux/poll.h>
#include <linux/sched.h>
#include <linux/device.h>
#include <linux/poll.h>
-#include <linux/
module
.h>
+#include <linux/
init
.h>
#include <linux/slab.h>
#include <linux/mutex.h>
#include <asm/sn/io.h>
#include <linux/slab.h>
#include <linux/mutex.h>
#include <asm/sn/io.h>
@@
-198,7
+198,7
@@
scdrv_read(struct file *file, char __user *buf, size_t count, loff_t *f_pos)
add_wait_queue(&sd->sd_rq, &wait);
spin_unlock_irqrestore(&sd->sd_rlock, flags);
add_wait_queue(&sd->sd_rq, &wait);
spin_unlock_irqrestore(&sd->sd_rlock, flags);
- schedule_timeout(
SCDRV_TIMEOUT
);
+ schedule_timeout(
msecs_to_jiffies(SCDRV_TIMEOUT)
);
remove_wait_queue(&sd->sd_rq, &wait);
if (signal_pending(current)) {
remove_wait_queue(&sd->sd_rq, &wait);
if (signal_pending(current)) {
@@
-294,7
+294,7
@@
scdrv_write(struct file *file, const char __user *buf,
add_wait_queue(&sd->sd_wq, &wait);
spin_unlock_irqrestore(&sd->sd_wlock, flags);
add_wait_queue(&sd->sd_wq, &wait);
spin_unlock_irqrestore(&sd->sd_wlock, flags);
- schedule_timeout(
SCDRV_TIMEOUT
);
+ schedule_timeout(
msecs_to_jiffies(SCDRV_TIMEOUT)
);
remove_wait_queue(&sd->sd_wq, &wait);
if (signal_pending(current)) {
remove_wait_queue(&sd->sd_wq, &wait);
if (signal_pending(current)) {
@@
-461,5
+461,4
@@
scdrv_init(void)
}
return 0;
}
}
return 0;
}
-
-module_init(scdrv_init);
+device_initcall(scdrv_init);