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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
include
/
asm-x86_64
/
smp.h
diff --git
a/include/asm-x86_64/smp.h
b/include/asm-x86_64/smp.h
index
e82b6a9
..
c210e39
100644
(file)
--- a/
include/asm-x86_64/smp.h
+++ b/
include/asm-x86_64/smp.h
@@
-47,7
+47,7
@@
extern void smp_invalidate_rcv(void); /* Process an NMI */
extern void (*mtrr_hook) (void);
extern void zap_low_mappings(void);
void smp_stop_cpu(void);
extern void (*mtrr_hook) (void);
extern void zap_low_mappings(void);
void smp_stop_cpu(void);
-extern c
har cpu_sibling_map[
];
+extern c
pumask_t cpu_sibling_map[NR_CPUS
];
extern char phys_proc_id[NR_CPUS];
#define SMP_TRAMPOLINE_BASE 0x6000
extern char phys_proc_id[NR_CPUS];
#define SMP_TRAMPOLINE_BASE 0x6000
@@
-60,7
+60,6
@@
extern char phys_proc_id[NR_CPUS];
extern cpumask_t cpu_callout_map;
#define cpu_possible_map cpu_callout_map
extern cpumask_t cpu_callout_map;
#define cpu_possible_map cpu_callout_map
-#define cpu_online(cpu) cpu_isset(cpu, cpu_online_map)
static inline int num_booting_cpus(void)
{
static inline int num_booting_cpus(void)
{
@@
-105,7
+104,6
@@
static inline int cpu_present_to_apicid(int mps_cpu)
return BAD_APICID;
}
return BAD_APICID;
}
-#define cpu_online(cpu) cpu_isset(cpu, cpu_online_map)
#endif /* !ASSEMBLY */
#define NO_PROC_ID 0xFF /* No processor magic marker */
#endif /* !ASSEMBLY */
#define NO_PROC_ID 0xFF /* No processor magic marker */
@@
-115,9
+113,9
@@
static inline int cpu_present_to_apicid(int mps_cpu)
#define TARGET_CPUS 1
#ifndef ASSEMBLY
#define TARGET_CPUS 1
#ifndef ASSEMBLY
-static inline unsigned int cpu_mask_to_apicid(cpumask_
const_
t cpumask)
+static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
{
{
- return cpus_
coerce_const(cpumask)
;
+ return cpus_
addr(cpumask)[0]
;
}
#endif
}
#endif