projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[firefly-linux-kernel-4.4.55.git]
/
Documentation
/
connector
/
cn_test.c
diff --git
a/Documentation/connector/cn_test.c
b/Documentation/connector/cn_test.c
index 3e73231695b3107eb743452836e8d0b24d17af85..6977c178729afcd192fd7b90bbdf768fbd5eabed 100644
(file)
--- a/
Documentation/connector/cn_test.c
+++ b/
Documentation/connector/cn_test.c
@@
-124,9
+124,8
@@
static void cn_test_timer_func(unsigned long __data)
struct cn_msg *m;
char data[32];
struct cn_msg *m;
char data[32];
- m = k
m
alloc(sizeof(*m) + sizeof(data), GFP_ATOMIC);
+ m = k
z
alloc(sizeof(*m) + sizeof(data), GFP_ATOMIC);
if (m) {
if (m) {
- memset(m, 0, sizeof(*m) + sizeof(data));
memcpy(&m->id, &cn_test_id, sizeof(m->id));
m->seq = cn_test_timer_counter;
memcpy(&m->id, &cn_test_id, sizeof(m->id));
m->seq = cn_test_timer_counter;
@@
-138,7
+137,7
@@
static void cn_test_timer_func(unsigned long __data)
memcpy(m + 1, data, m->len);
memcpy(m + 1, data, m->len);
- cn_netlink_send(m, 0,
gfp_any()
);
+ cn_netlink_send(m, 0,
GFP_ATOMIC
);
kfree(m);
}
kfree(m);
}
@@
-161,10
+160,8
@@
static int cn_test_init(void)
goto err_out;
}
goto err_out;
}
- init_timer(&cn_test_timer);
- cn_test_timer.function = cn_test_timer_func;
+ setup_timer(&cn_test_timer, cn_test_timer_func, 0);
cn_test_timer.expires = jiffies + HZ;
cn_test_timer.expires = jiffies + HZ;
- cn_test_timer.data = 0;
add_timer(&cn_test_timer);
return 0;
add_timer(&cn_test_timer);
return 0;