From: bob picco <bpicco@meloft.net>
Date: Thu, 28 Feb 2013 15:11:27 +0000 (-0500)
Subject: sparc64: node_random needs attention
X-Git-Tag: v4.1.12-92~74^2~28
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3a7f3551f57d75a24cbe4fbc98048bd8d957feec;p=users%2Fjedix%2Flinux-maple.git

sparc64: node_random needs attention

Seriously node_random will have to be hooked into sparc.

Orabug: 23128525

Signed-off-by: Bob Picco <bob.picco@oracle.com>
(cherry picked from commit 9c8ab6e8096ddf1814df8503cdd10ee83b4ddf9a)
(cherry picked from commit 640de4e021c24037420ddb4c52cc91b002d72ad7)

Conflicts:
	kernel/fork.c
Signed-off-by: Allen Pais <allen.pais@oracle.com>

Signed-off-by: Allen Pais <allen.pais@oracle.com>
(cherry picked from commit 07bb1228d250a4e3003ccf317da22c06310b8607)
(cherry picked from commit cdeddef5edf0de95cff6ca8c8b7efe94322492d7)
---

diff --git a/kernel/fork.c b/kernel/fork.c
index 03c1eaaa6ef5..bc567beb2b6e 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1377,10 +1377,12 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 	}
 #endif
 #ifdef CONFIG_CPUSETS
+#ifndef __sparc_v9__
 	p->cpuset_mem_spread_rotor = NUMA_NO_NODE;
 	p->cpuset_slab_spread_rotor = NUMA_NO_NODE;
 	seqcount_init(&p->mems_allowed_seq);
 #endif
+#endif
 #ifdef CONFIG_TRACE_IRQFLAGS
 	p->irq_events = 0;
 	p->hardirqs_enabled = 0;