---

yaml --- r: 351219 b: refs/heads/master c: 61c5e88 h: refs/heads/master i: 351217: ad23795 351215: 4b5c1e2 v: v3
git-mirror · Dec 29, 2012 · 07a1214 · 07a1214
1 parent 4df4027
commit 07a1214
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb717d764926b8748aecd18e3531189b323f6e4d
+refs/heads/master: 61c5e88aecd6fbf2480f39394bb495964e6d9984
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
@@ -155,8 +155,9 @@ static void skb_under_panic(struct sk_buff *skb, int sz, void *here)
  */
 #define kmalloc_reserve(size, gfp, node, pfmemalloc) \
 	 __kmalloc_reserve(size, gfp, node, _RET_IP_, pfmemalloc)
-void *__kmalloc_reserve(size_t size, gfp_t flags, int node, unsigned long ip,
-			 bool *pfmemalloc)
+
+static void *__kmalloc_reserve(size_t size, gfp_t flags, int node,
+			       unsigned long ip, bool *pfmemalloc)
 {
 	void *obj;
 	bool ret_pfmemalloc = false;