diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 06:25:51 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 06:25:51 -0500 |
| commit | 968ea6d80e395cf11a51143cfa1b9a14ada676df (patch) | |
| tree | dc2acec8c9bdced33afe1e273ee5e0b0b93d2703 /include/linux/topology.h | |
| parent | 7be7585393d311866653564fbcd10a3232773c0b (diff) | |
| parent | 8299608f140ae321e4eb5d1306184265d2b9511e (diff) | |
Merge ../linux-2.6-x86
Conflicts:
arch/x86/kernel/io_apic.c
kernel/sched.c
kernel/sched_stats.h
Diffstat (limited to 'include/linux/topology.h')
| -rw-r--r-- | include/linux/topology.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/topology.h b/include/linux/topology.h index 117f1b7405cf..0c5b5ac36d8e 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | for_each_online_node(node) \ | 49 | for_each_online_node(node) \ |
| 50 | if (nr_cpus_node(node)) | 50 | if (nr_cpus_node(node)) |
| 51 | 51 | ||
| 52 | void arch_update_cpu_topology(void); | 52 | int arch_update_cpu_topology(void); |
| 53 | 53 | ||
| 54 | /* Conform to ACPI 2.0 SLIT distance definitions */ | 54 | /* Conform to ACPI 2.0 SLIT distance definitions */ |
| 55 | #define LOCAL_DISTANCE 10 | 55 | #define LOCAL_DISTANCE 10 |