diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /include/asm-i386/topology.h | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-i386/topology.h')
| -rw-r--r-- | include/asm-i386/topology.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-i386/topology.h b/include/asm-i386/topology.h index aa958c6ee83e..b94e5eeef917 100644 --- a/include/asm-i386/topology.h +++ b/include/asm-i386/topology.h | |||
| @@ -112,4 +112,6 @@ extern unsigned long node_remap_size[]; | |||
| 112 | 112 | ||
| 113 | #endif /* CONFIG_NUMA */ | 113 | #endif /* CONFIG_NUMA */ |
| 114 | 114 | ||
| 115 | extern cpumask_t cpu_coregroup_map(int cpu); | ||
| 116 | |||
| 115 | #endif /* _ASM_I386_TOPOLOGY_H */ | 117 | #endif /* _ASM_I386_TOPOLOGY_H */ |