From 4aa26504e8edc3e43db1569709aa9e090058f7ff Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 12 Feb 2009 16:47:01 -0800 Subject: [PATCH] --- yaml --- r: 131327 b: refs/heads/master c: f82da723398ff18d49275a5f03de6cae5f592e8e h: refs/heads/master i: 131325: 27df0c3b10da8ab290756c29abbbd8a1a0ca54c0 131323: ccc7c9fb449ce150746732b6629c3dd148857515 131319: 62f6274dd2fb065a23784237fc67b2224336e9e9 131311: 06f61f49b6db9449aa59ad76ed62f4630f675954 131295: 63e556fe0722b38eebdd6dfe15612417593d728c 131263: 2ba13b79e734df0315ec0d12740406535a79385c 131199: 1ad79ab3d4cf8141c3be5e439ba7e533734a0949 131071: 5e1d55329a1e76f29215b146a22e31dd45999a04 v: v3 --- [refs] | 2 +- trunk/Documentation/connector/cn_test.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7c14958723b9..f2e743a63c9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99709372736a216f99eb32b76fba835a2bfc93a8 +refs/heads/master: f82da723398ff18d49275a5f03de6cae5f592e8e diff --git a/trunk/Documentation/connector/cn_test.c b/trunk/Documentation/connector/cn_test.c index be7af146dd30..6977c178729a 100644 --- a/trunk/Documentation/connector/cn_test.c +++ b/trunk/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;