diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-25 07:42:32 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-25 07:42:32 +0900 |
| commit | c12ae95ccc2dc80b4bd57363240cdb6eab2adcbc (patch) | |
| tree | af3312bda2b0740278767867dadcf9c6223dc377 /arch/tile/kernel | |
| parent | 47143b094d4700842e42b0a7cc2548d7ae292690 (diff) | |
| parent | 3edabee2ed22ee4f98f4b4bb38a41059226a8446 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: fix memchr() not to dereference memory for zero length
arch/tile: make glibc's sysconf(_SC_NPROCESSORS_CONF) work correctly
arch/tile: fix rwlock so would-be write lockers don't block new readers
Diffstat (limited to 'arch/tile/kernel')
| -rw-r--r-- | arch/tile/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c index fb0b3cbeae1..f18573643ed 100644 --- a/arch/tile/kernel/setup.c +++ b/arch/tile/kernel/setup.c @@ -840,7 +840,7 @@ static int __init topology_init(void) for_each_online_node(i) register_one_node(i); - for_each_present_cpu(i) + for (i = 0; i < smp_height * smp_width; ++i) register_cpu(&cpu_devices[i], i); return 0; |