From: Andrey Ryabinin <aryabinin@virtuozzo.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>,
Mel Gorman <mgorman@techsingularity.net>,
Willem de Bruijn <willemb@google.com>,
Florian Westphal <fw@strlen.de>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
Andrey Ryabinin <aryabinin@virtuozzo.com>
Subject: [PATCH 4/4] net/skbuff: kmalloc_reserve(): remove unused argument
Date: Thu, 18 Apr 2019 21:05:24 +0300 [thread overview]
Message-ID: <20190418180524.23489-4-aryabinin@virtuozzo.com> (raw)
In-Reply-To: <20190418180524.23489-1-aryabinin@virtuozzo.com>
Argument 'ip' always has been unused. Remove it.
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
---
net/core/skbuff.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 97557554e90e..5cd067b44371 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -126,11 +126,8 @@ static void skb_under_panic(struct sk_buff *skb, unsigned int sz, void *addr)
* may be used. Otherwise, the packet data may be discarded until enough
* memory is free
*/
-#define kmalloc_reserve(size, gfp, node, pfmemalloc) \
- __kmalloc_reserve(size, gfp, node, _RET_IP_, pfmemalloc)
-
-static 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,
+ bool *pfmemalloc)
{
void *obj;
gfp_t gfp_mask = flags;
--
2.21.0
next prev parent reply other threads:[~2019-04-18 18:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-18 18:05 [PATCH 1/4] net/skbuff: don't waste memory reserves Andrey Ryabinin
2019-04-18 18:05 ` [PATCH 2/4] net/skbuff: warn if kmalloc_reserve() fails to allocate memory Andrey Ryabinin
2019-04-18 18:05 ` [PATCH 3/4] net/skbuff: remove unused skb_propagate_pfmemalloc() Andrey Ryabinin
2019-04-18 18:05 ` Andrey Ryabinin [this message]
2019-04-18 18:55 ` [PATCH 1/4] net/skbuff: don't waste memory reserves Eric Dumazet
2019-04-18 18:56 ` David Miller
2019-04-19 13:17 ` Andrey Ryabinin
2019-04-19 13:36 ` Eric Dumazet
2019-04-19 13:41 ` Eric Dumazet
2019-04-19 16:25 ` Andrey Ryabinin
2019-04-19 16:27 ` Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190418180524.23489-4-aryabinin@virtuozzo.com \
--to=aryabinin@virtuozzo.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mgorman@techsingularity.net \
--cc=netdev@vger.kernel.org \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).