diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /arch/ia64/kernel/topology.c | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/ia64/kernel/topology.c')
| -rw-r--r-- | arch/ia64/kernel/topology.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index d24fa393b182..f648c610b10c 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c | |||
| @@ -67,10 +67,8 @@ static int __init topology_init(void) | |||
| 67 | #endif | 67 | #endif |
| 68 | 68 | ||
| 69 | sysfs_cpus = kzalloc(sizeof(struct ia64_cpu) * NR_CPUS, GFP_KERNEL); | 69 | sysfs_cpus = kzalloc(sizeof(struct ia64_cpu) * NR_CPUS, GFP_KERNEL); |
| 70 | if (!sysfs_cpus) { | 70 | if (!sysfs_cpus) |
| 71 | err = -ENOMEM; | 71 | panic("kzalloc in topology_init failed - NR_CPUS too big?"); |
| 72 | goto out; | ||
| 73 | } | ||
| 74 | 72 | ||
| 75 | for_each_present_cpu(i) { | 73 | for_each_present_cpu(i) { |
| 76 | if((err = arch_register_cpu(i))) | 74 | if((err = arch_register_cpu(i))) |