浏览代码

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>
Andrew Morton 16 年之前
父节点
当前提交
f82da72339
共有 1 个文件被更改,包括 2 次插入4 次删除
  1. 2 4
      Documentation/connector/cn_test.c

+ 2 - 4
Documentation/connector/cn_test.c

@@ -137,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);
 	}
 	}
 
 
@@ -160,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);
 	add_timer(&cn_test_timer);
 
 
 	return 0;
 	return 0;