diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2009-09-15 07:36:13 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-09-17 14:07:43 -0400 |
commit | 7e17615c45980fc34d3f7d04bc7063cfc32180ec (patch) | |
tree | 0ad0493669fc81e7a04bfcfd2a9b90aaff7370f5 | |
parent | 70ebadc8e30efef3bf21ba94b3571537de8bcf4e (diff) |
MIPS: Get rid of duplicate cpu_idle() prototype.
Since 2.6.11-rc1 there is a prototype in <linux/smp.h>.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/kernel/smp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index bc7d9b05e2f..64668a93248 100644 --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <linux/cpumask.h> | 32 | #include <linux/cpumask.h> |
33 | #include <linux/cpu.h> | 33 | #include <linux/cpu.h> |
34 | #include <linux/err.h> | 34 | #include <linux/err.h> |
35 | #include <linux/smp.h> | ||
35 | 36 | ||
36 | #include <asm/atomic.h> | 37 | #include <asm/atomic.h> |
37 | #include <asm/cpu.h> | 38 | #include <asm/cpu.h> |
@@ -49,8 +50,6 @@ volatile cpumask_t cpu_callin_map; /* Bitmask of started secondaries */ | |||
49 | int __cpu_number_map[NR_CPUS]; /* Map physical to logical */ | 50 | int __cpu_number_map[NR_CPUS]; /* Map physical to logical */ |
50 | int __cpu_logical_map[NR_CPUS]; /* Map logical to physical */ | 51 | int __cpu_logical_map[NR_CPUS]; /* Map logical to physical */ |
51 | 52 | ||
52 | extern void cpu_idle(void); | ||
53 | |||
54 | /* Number of TCs (or siblings in Intel speak) per CPU core */ | 53 | /* Number of TCs (or siblings in Intel speak) per CPU core */ |
55 | int smp_num_siblings = 1; | 54 | int smp_num_siblings = 1; |
56 | EXPORT_SYMBOL(smp_num_siblings); | 55 | EXPORT_SYMBOL(smp_num_siblings); |