diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-02 16:33:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-02 16:33:51 +0200 |
| commit | 83f2f0ed715eb15a8e13c07df479d65bbc10d8d5 (patch) | |
| tree | e47d7edefa210b328f8cfba43d170fc67d6e0671 /arch/mips/kernel/smp.c | |
| parent | 3de46fda4c104deef17ec70f85361f5c6b84ce0e (diff) | |
| parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 (diff) | |
| download | linux-83f2f0ed715eb15a8e13c07df479d65bbc10d8d5.tar.bz2 | |
Merge branch 'linus' into x86/urgent
Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic)
and fix it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/kernel/smp.c')
| -rw-r--r-- | arch/mips/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index 3da94704f816..c937506a03aa 100644 --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c @@ -44,7 +44,7 @@ #include <asm/mipsmtregs.h> #endif /* CONFIG_MIPS_MT_SMTC */ -volatile cpumask_t cpu_callin_map; /* Bitmask of started secondaries */ +static volatile cpumask_t cpu_callin_map; /* Bitmask of started secondaries */ int __cpu_number_map[NR_CPUS]; /* Map physical to logical */ int __cpu_logical_map[NR_CPUS]; /* Map logical to physical */ |