diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 07:48:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 07:48:57 -0500 |
| commit | 45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df (patch) | |
| tree | 4d51c73533c386aee16fde1e74b5e3bc22eedc53 /include/linux/topology.h | |
| parent | 81444a799550214f549caf579cf65a0ca55e70b7 (diff) | |
| parent | d65bd5ecb2bd166cea4952a59b7e16cc3ad6ef6c (diff) | |
Merge branch 'sched/core' into cpus4096
Conflicts:
include/linux/ftrace.h
kernel/sched.c
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 |