diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-01-28 23:12:55 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 23:12:55 +0100 |
| commit | 6a385db5ce7f1fd2c68ec511e44587b67dab8fca (patch) | |
| tree | 9324c8ae6f7be54b9fdbd6b60f759292aa727b1f /include/linux/topology.h | |
| parent | Linux 2.6.29-rc3 (diff) | |
| parent | Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu (diff) | |
| download | linux-dev-6a385db5ce7f1fd2c68ec511e44587b67dab8fca.tar.xz linux-dev-6a385db5ce7f1fd2c68ec511e44587b67dab8fca.zip | |
Merge branch 'core/percpu' into x86/core
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'include/linux/topology.h')
| -rw-r--r-- | include/linux/topology.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/topology.h b/include/linux/topology.h index e632d29f0544..a16b9e06f2e5 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h @@ -193,5 +193,11 @@ int arch_update_cpu_topology(void); #ifndef topology_core_siblings #define topology_core_siblings(cpu) cpumask_of_cpu(cpu) #endif +#ifndef topology_thread_cpumask +#define topology_thread_cpumask(cpu) cpumask_of(cpu) +#endif +#ifndef topology_core_cpumask +#define topology_core_cpumask(cpu) cpumask_of(cpu) +#endif #endif /* _LINUX_TOPOLOGY_H */ |