diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-07-28 17:04:15 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-07-28 17:04:15 +0200 |
commit | 565f46dc4d0c12dda1353dbd76314614c7069c20 (patch) | |
tree | a9e933f56e4f935bc3bb6b0d270b6be789fed6a9 /lib/cpumask.c | |
parent | 4fd1f229c2bc39b7f35f2a9f9fb9892f2d665359 (diff) | |
parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) |
Merge tag 'v3.16-rc6' into next/dt
Update to Linux 3.16-rc6 as a dependency for the broadcom changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'lib/cpumask.c')
-rw-r--r-- | lib/cpumask.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cpumask.c b/lib/cpumask.c index c101230658eb..b6513a9f2892 100644 --- a/lib/cpumask.c +++ b/lib/cpumask.c @@ -191,7 +191,7 @@ int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp) i %= num_online_cpus(); - if (!cpumask_of_node(numa_node)) { + if (numa_node == -1 || !cpumask_of_node(numa_node)) { /* Use all online cpu's for non numa aware system */ cpumask_copy(mask, cpu_online_mask); } else { |