diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-28 13:56:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-28 13:56:12 +0100 |
| commit | 918b43547f438ae800284623ae960362f3d4ae98 (patch) | |
| tree | 61f5493573c620eea3d09887cd9652a401c9d796 /arch/sh/include | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | c3d80000e3a812fe5a200d6bde755fbd7fa65481 (diff) | |
Merge branch 'cpus4096' into auto-cpus4096-next
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/smp.h | 2 | ||||
| -rw-r--r-- | arch/sh/include/asm/topology.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/include/asm/smp.h b/arch/sh/include/asm/smp.h index 85b660c17eb0..c24e9c6a1736 100644 --- a/arch/sh/include/asm/smp.h +++ b/arch/sh/include/asm/smp.h @@ -31,7 +31,7 @@ enum { }; void smp_message_recv(unsigned int msg); -void smp_timer_broadcast(cpumask_t mask); +void smp_timer_broadcast(const struct cpumask *mask); void local_timer_interrupt(void); void local_timer_setup(unsigned int cpu); diff --git a/arch/sh/include/asm/topology.h b/arch/sh/include/asm/topology.h index 95f0085e098a..279d9cc4a007 100644 --- a/arch/sh/include/asm/topology.h +++ b/arch/sh/include/asm/topology.h @@ -5,7 +5,6 @@ /* sched_domains SD_NODE_INIT for sh machines */ #define SD_NODE_INIT (struct sched_domain) { \ - .span = CPU_MASK_NONE, \ .parent = NULL, \ .child = NULL, \ .groups = NULL, \ |