diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-12 12:19:16 -0800 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-12 12:19:16 -0800 |
| commit | 9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9 (patch) | |
| tree | 17852dd654c37bf86cf3d98c692eef4c6fa73a2c /include/asm-generic/topology.h | |
| parent | 7cc718d56c8297bd3a3c106ca09e8abf9814bb27 (diff) | |
| parent | 96b5a46e2a72dc1829370c87053e0cd558d58bc0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-generic/topology.h')
| -rw-r--r-- | include/asm-generic/topology.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-generic/topology.h b/include/asm-generic/topology.h index 5d9d70cd17f..342a2a0105c 100644 --- a/include/asm-generic/topology.h +++ b/include/asm-generic/topology.h @@ -30,19 +30,19 @@ /* Other architectures wishing to use this simple topology API should fill in the below functions as appropriate in their own <asm/topology.h> file. */ #ifndef cpu_to_node -#define cpu_to_node(cpu) (0) +#define cpu_to_node(cpu) ((void)(cpu),0) #endif #ifndef parent_node -#define parent_node(node) (0) +#define parent_node(node) ((void)(node),0) #endif #ifndef node_to_cpumask -#define node_to_cpumask(node) (cpu_online_map) +#define node_to_cpumask(node) ((void)node, cpu_online_map) #endif #ifndef node_to_first_cpu -#define node_to_first_cpu(node) (0) +#define node_to_first_cpu(node) ((void)(node),0) #endif #ifndef pcibus_to_node -#define pcibus_to_node(node) (-1) +#define pcibus_to_node(bus) ((void)(bus), -1) #endif #ifndef pcibus_to_cpumask |