aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/connector
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2009-02-12 16:47:01 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-12 16:47:01 -0800
commitf82da723398ff18d49275a5f03de6cae5f592e8e (patch)
treeacd95449d77d4b565baa71eb287d228a1e1fcbf4 /Documentation/connector
parent99709372736a216f99eb32b76fba835a2bfc93a8 (diff)
Documentation/connector/cn_test.c: don't use gfp_any()
cn_test_timer_func() is a timer handler and can never use GFP_KERNEL - there's no point in using gfp_any() here. Also, use setup_timer(). Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/connector')
-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;

Privacy Policy