From: akpm@linux-foundation.org
To: akpm@linux-foundation.org, aaron.lu@intel.com,
andi@firstfloor.org, hughd@google.com, mhocko@suse.com,
minchan@kernel.org, tim.c.chen@intel.com, ying.huang@intel.com,
mm-commits@vger.kernel.org
Subject: [folded-merged] swap-choose-swap-device-according-to-numa-node-v2-fix.patch removed from -mm tree
Date: Wed, 06 Sep 2017 16:09:02 -0700 [thread overview]
Message-ID: <59b0800e.VCg5eMfmluGq5zGb%akpm@linux-foundation.org> (raw)
The patch titled
Subject: swap-choose-swap-device-according-to-numa-node-v2-fix
has been removed from the -mm tree. Its filename was
swap-choose-swap-device-according-to-numa-node-v2-fix.patch
This patch was dropped because it was folded into swap-choose-swap-device-according-to-numa-node.patch
------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: swap-choose-swap-device-according-to-numa-node-v2-fix
use kmalloc_array()
Cc: "Chen, Tim C" <tim.c.chen@intel.com>
Cc: Aaron Lu <aaron.lu@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/swapfile.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN mm/swapfile.c~swap-choose-swap-device-according-to-numa-node-v2-fix mm/swapfile.c
--- a/mm/swapfile.c~swap-choose-swap-device-according-to-numa-node-v2-fix
+++ a/mm/swapfile.c
@@ -3700,7 +3700,8 @@ static int __init swapfile_init(void)
{
int nid;
- swap_avail_heads = kmalloc(nr_node_ids * sizeof(struct plist_head), GFP_KERNEL);
+ swap_avail_heads = kmalloc_array(nr_node_ids, sizeof(struct plist_head),
+ GFP_KERNEL);
if (!swap_avail_heads) {
pr_emerg("Not enough memory for swap heads, swap is disabled\n");
return -ENOMEM;
_
Patches currently in -mm which might be from akpm@linux-foundation.org are
swap-choose-swap-device-according-to-numa-node.patch
mmfork-introduce-madv_wipeonfork-fix.patch
reply other threads:[~2017-09-06 23:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=59b0800e.VCg5eMfmluGq5zGb%akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=aaron.lu@intel.com \
--cc=andi@firstfloor.org \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhocko@suse.com \
--cc=minchan@kernel.org \
--cc=mm-commits@vger.kernel.org \
--cc=tim.c.chen@intel.com \
--cc=ying.huang@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.