diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-07-19 14:36:00 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-07-19 14:36:00 -0700 |
| commit | 076fb01e8238b7e5d68ba0d729c0ff7716d1d8ec (patch) | |
| tree | abcaefe016870427ed289748cb0b936575d60593 /arch/ia64/kernel/topology.c | |
| parent | 4c48b0d3d1c7ff9f13134b30e41c6e81a92027bf (diff) | |
| parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ia64/kernel/topology.c')
| -rw-r--r-- | arch/ia64/kernel/topology.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index d8030f3bd86..92ff46ad21e 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c @@ -36,12 +36,14 @@ int arch_register_cpu(int num) parent = &sysfs_nodes[cpu_to_node(num)]; #endif /* CONFIG_NUMA */ +#ifdef CONFIG_ACPI_BOOT /* * If CPEI cannot be re-targetted, and this is * CPEI target, then dont create the control file */ if (!can_cpei_retarget() && is_cpu_cpei_target(num)) sysfs_cpus[num].cpu.no_control = 1; +#endif return register_cpu(&sysfs_cpus[num].cpu, num, parent); } |