git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-mips
/
smp.h
diff --git
a/include/asm-mips/smp.h
b/include/asm-mips/smp.h
index
8ba370e
..
1608fd7
100644
(file)
--- a/
include/asm-mips/smp.h
+++ b/
include/asm-mips/smp.h
@@
-11,7
+11,6
@@
#ifndef __ASM_SMP_H
#define __ASM_SMP_H
#ifndef __ASM_SMP_H
#define __ASM_SMP_H
-#include <linux/config.h>
#ifdef CONFIG_SMP
#ifdef CONFIG_SMP
@@
-21,7
+20,7
@@
#include <linux/cpumask.h>
#include <asm/atomic.h>
#include <linux/cpumask.h>
#include <asm/atomic.h>
-#define
smp_processor_id()
(current_thread_info()->cpu)
+#define
raw_smp_processor_id()
(current_thread_info()->cpu)
/* Map from cpu id to sequential logical cpu number. This will only
not be idempotent when cpus failed to come on-line. */
/* Map from cpu id to sequential logical cpu number. This will only
not be idempotent when cpus failed to come on-line. */
@@
-48,7
+47,6
@@
extern struct call_data_struct *call_data;
#define SMP_CALL_FUNCTION 0x2
extern cpumask_t phys_cpu_present_map;
#define SMP_CALL_FUNCTION 0x2
extern cpumask_t phys_cpu_present_map;
-extern cpumask_t cpu_online_map;
#define cpu_possible_map phys_cpu_present_map
extern cpumask_t cpu_callout_map;
#define cpu_possible_map phys_cpu_present_map
extern cpumask_t cpu_callout_map;
@@
-58,7
+56,9
@@
static inline int num_booting_cpus(void)
return cpus_weight(cpu_callout_map);
}
return cpus_weight(cpu_callout_map);
}
-/* These are defined by the board-specific code. */
+/*
+ * These are defined by the board-specific code.
+ */
/*
* Cause the function described by call_data to be executed on the passed
/*
* Cause the function described by call_data to be executed on the passed
@@
-79,9
+79,14
@@
extern void prom_boot_secondary(int cpu, struct task_struct *idle);
extern void prom_init_secondary(void);
/*
extern void prom_init_secondary(void);
/*
- * Detect available CPUs, populate phys_cpu_present_map before smp_init
+ * Populate cpu_possible_map before smp_init, called from setup_arch.
+ */
+extern void plat_smp_setup(void);
+
+/*
+ * Called in smp_prepare_cpus.
*/
*/
-extern void p
rom
_prepare_cpus(unsigned int max_cpus);
+extern void p
lat
_prepare_cpus(unsigned int max_cpus);
/*
* Last chance for the board code to finish SMP initialization before
/*
* Last chance for the board code to finish SMP initialization before