Commit 58c0a4a7 authored by Yasunori Goto's avatar Yasunori Goto Committed by Linus Torvalds

Fix panic of cpu online with memory less node

When a cpu is onlined on memory-less-node box, kernel panics due to touch
NULL pointer of pgdat->kswapd.  Current kswapd runs only nodes which have
memory.  So, calling of set_cpus_allowed() is not necessary for memory-less
node.

This is fix for it.
Signed-off-by: default avatarYasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 37b07e41
...@@ -1694,9 +1694,11 @@ static int __devinit cpu_callback(struct notifier_block *nfb, ...@@ -1694,9 +1694,11 @@ static int __devinit cpu_callback(struct notifier_block *nfb,
{ {
pg_data_t *pgdat; pg_data_t *pgdat;
cpumask_t mask; cpumask_t mask;
int nid;
if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) { if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) {
for_each_online_pgdat(pgdat) { for_each_node_state(nid, N_HIGH_MEMORY) {
pgdat = NODE_DATA(nid);
mask = node_to_cpumask(pgdat->node_id); mask = node_to_cpumask(pgdat->node_id);
if (any_online_cpu(mask) != NR_CPUS) if (any_online_cpu(mask) != NR_CPUS)
/* One of our CPUs online: restore mask */ /* One of our CPUs online: restore mask */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment