summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-15 20:08:55 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-15 20:08:55 +0100
commit9abd60304816a5b0fd9e51034f78e3eaed89f901 (patch)
tree5fb431bbfd133b6e2d19dabd196d87ea5bf281cf /Documentation
parent5fb896a4e916e72efec4772b66be1cce3d6a9143 (diff)
parentf9aa28adfc6a4b01268ebb6d88566cca8627905f (diff)
downloadlinux-stable-9abd60304816a5b0fd9e51034f78e3eaed89f901.tar.gz
linux-stable-9abd60304816a5b0fd9e51034f78e3eaed89f901.tar.bz2
linux-stable-9abd60304816a5b0fd9e51034f78e3eaed89f901.zip
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Conflicts: kernel/trace/trace_mmiotrace.c
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/connector/cn_test.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/connector/cn_test.c b/Documentation/connector/cn_test.c
index be7af146dd30..6977c178729a 100644
--- a/Documentation/connector/cn_test.c
+++ b/Documentation/connector/cn_test.c
@@ -137,7 +137,7 @@ static void cn_test_timer_func(unsigned long __data)
memcpy(m + 1, data, m->len);
- cn_netlink_send(m, 0, gfp_any());
+ cn_netlink_send(m, 0, GFP_ATOMIC);
kfree(m);
}
@@ -160,10 +160,8 @@ static int cn_test_init(void)
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.data = 0;
add_timer(&cn_test_timer);
return 0;