projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Char: moxa, macros cleanup
[powerpc.git]
/
drivers
/
char
/
random.c
diff --git
a/drivers/char/random.c
b/drivers/char/random.c
index
d40df30
..
13d0b13
100644
(file)
--- a/
drivers/char/random.c
+++ b/
drivers/char/random.c
@@
-1048,7
+1048,7
@@
random_write(struct file * file, const char __user * buffer,
if (p == buffer) {
return (ssize_t)ret;
} else {
if (p == buffer) {
return (ssize_t)ret;
} else {
- struct inode *inode = file->f_dentry->d_inode;
+ struct inode *inode = file->f_
path.
dentry->d_inode;
inode->i_mtime = current_fs_time(inode->i_sb);
mark_inode_dirty(inode);
return (ssize_t)(p - buffer);
inode->i_mtime = current_fs_time(inode->i_sb);
mark_inode_dirty(inode);
return (ssize_t)(p - buffer);
@@
-1203,7
+1203,7
@@
static int proc_do_uuid(ctl_table *table, int write, struct file *filp,
static int uuid_strategy(ctl_table *table, int __user *name, int nlen,
void __user *oldval, size_t __user *oldlenp,
static int uuid_strategy(ctl_table *table, int __user *name, int nlen,
void __user *oldval, size_t __user *oldlenp,
- void __user *newval, size_t newlen
, void **context
)
+ void __user *newval, size_t newlen)
{
unsigned char tmp_uuid[16], *uuid;
unsigned int len;
{
unsigned char tmp_uuid[16], *uuid;
unsigned int len;
@@
-1422,9
+1422,9
@@
static struct keydata {
static unsigned int ip_cnt;
static unsigned int ip_cnt;
-static void rekey_seq_generator(
void *private_
);
+static void rekey_seq_generator(
struct work_struct *work
);
-static DECLARE_
WORK(rekey_work, rekey_seq_generator, NULL
);
+static DECLARE_
DELAYED_WORK(rekey_work, rekey_seq_generator
);
/*
* Lock avoidance:
/*
* Lock avoidance:
@@
-1438,7
+1438,7
@@
static DECLARE_WORK(rekey_work, rekey_seq_generator, NULL);
* happen, and even if that happens only a not perfectly compliant
* ISN is generated, nothing fatal.
*/
* happen, and even if that happens only a not perfectly compliant
* ISN is generated, nothing fatal.
*/
-static void rekey_seq_generator(
void *private_
)
+static void rekey_seq_generator(
struct work_struct *work
)
{
struct keydata *keyptr = &ip_keydata[1 ^ (ip_cnt & 1)];
{
struct keydata *keyptr = &ip_keydata[1 ^ (ip_cnt & 1)];