From dec3852f4b006ade12d3522577025c7ad7cb311a Mon Sep 17 00:00:00 2001
From: Thomas Graf <tgraf@suug.ch>
Date: Tue, 14 Nov 2006 19:44:52 -0800
Subject: [PATCH] --- yaml --- r: 41663 b: refs/heads/master c:
 3dabc7157859e706770c825aa229f8943db4e0e1 h: refs/heads/master i:   41661:
 77217a1edfc56caa6fd06d43cce7551bc9c479b0   41659:
 d932616cb1a9138674faf01b96297e0f68f6c798   41655:
 be260e7b83dbd86f274b44b288e34cd6bf99c605   41647:
 cf1e89ffc67e72d3b4c37969423420fcb3dc1457   41631:
 e9cf397bb5e96aa536e9139d96ef295c7f14e9f1   41599:
 6da8a00289c686a3c0537681047a5383c325928a v: v3

---
 [refs]                        |  2 +-
 trunk/include/net/genetlink.h | 11 +++++++++++
 trunk/kernel/taskstats.c      |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9aaa9dc95c1a..b63308ad8054 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfb6eeb4c860592edd123fdea908d23c6ad1c7dc
+refs/heads/master: 3dabc7157859e706770c825aa229f8943db4e0e1
diff --git a/trunk/include/net/genetlink.h b/trunk/include/net/genetlink.h
index b619314218a6..2010465fa7d4 100644
--- a/trunk/include/net/genetlink.h
+++ b/trunk/include/net/genetlink.h
@@ -187,4 +187,15 @@ static inline int genlmsg_total_size(int payload)
 	return NLMSG_ALIGN(genlmsg_msg_size(payload));
 }
 
+/**
+ * genlmsg_new - Allocate a new generic netlink message
+ * @payload: size of the message payload
+ * @flags: the type of memory to allocate.
+ */
+static inline struct sk_buff *genlmsg_new(size_t payload, gfp_t flags)
+{
+	return nlmsg_new(genlmsg_total_size(payload), flags);
+}
+
+
 #endif	/* __NET_GENERIC_NETLINK_H */
diff --git a/trunk/kernel/taskstats.c b/trunk/kernel/taskstats.c
index 4f3f0e48c845..faa5239813ce 100644
--- a/trunk/kernel/taskstats.c
+++ b/trunk/kernel/taskstats.c
@@ -77,7 +77,7 @@ static int prepare_reply(struct genl_info *info, u8 cmd, struct sk_buff **skbp,
 	/*
 	 * If new attributes are added, please revisit this allocation
 	 */
-	skb = nlmsg_new(genlmsg_total_size(size), GFP_KERNEL);
+	skb = genlmsg_new(size, GFP_KERNEL);
 	if (!skb)
 		return -ENOMEM;