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.5.x5
[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
..
fe523e3
100644
(file)
--- a/
include/asm-x86_64/smp.h
+++ b/
include/asm-x86_64/smp.h
@@
-47,8
+47,8
@@
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
char
phys_proc_id[NR_CPUS];
+extern c
pumask_t cpu_sibling_map[NR_CPUS
];
+extern
u8
phys_proc_id[NR_CPUS];
#define SMP_TRAMPOLINE_BASE 0x6000
#define SMP_TRAMPOLINE_BASE 0x6000
@@
-59,15
+59,15
@@
extern char phys_proc_id[NR_CPUS];
*/
extern cpumask_t cpu_callout_map;
*/
extern cpumask_t cpu_callout_map;
+extern cpumask_t cpu_callin_map;
#define cpu_possible_map 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)
{
return cpus_weight(cpu_callout_map);
}
static inline int num_booting_cpus(void)
{
return cpus_weight(cpu_callout_map);
}
-#define smp_processor_id() read_pda(cpunumber)
+#define
__
smp_processor_id() read_pda(cpunumber)
extern __inline int hard_smp_processor_id(void)
{
extern __inline int hard_smp_processor_id(void)
{
@@
-75,14
+75,29
@@
extern __inline int hard_smp_processor_id(void)
return GET_APIC_ID(*(unsigned int *)(APIC_BASE+APIC_ID));
}
return GET_APIC_ID(*(unsigned int *)(APIC_BASE+APIC_ID));
}
+#define safe_smp_processor_id() (disable_apic ? 0 : x86_apicid_to_cpu(hard_smp_processor_id()))
+
+#endif /* !ASSEMBLY */
+
+#define NO_PROC_ID 0xFF /* No processor magic marker */
+
+#endif
+
+#ifndef ASSEMBLY
/*
* Some lowlevel functions might want to know about
* the real APIC ID <-> CPU # mapping.
/*
* Some lowlevel functions might want to know about
* the real APIC ID <-> CPU # mapping.
- * AK: why is this volatile?
*/
*/
-extern volatile char x86_cpu_to_apicid[NR_CPUS];
+extern u8 x86_cpu_to_apicid[NR_CPUS]; /* physical ID */
+extern u8 x86_cpu_to_log_apicid[NR_CPUS];
+extern u8 bios_cpu_apicid[];
+
+static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
+{
+ return cpus_addr(cpumask)[0];
+}
-static inline
char x86_apicid_to_cpu(char
apicid)
+static inline
int x86_apicid_to_cpu(u8
apicid)
{
int i;
{
int i;
@@
-90,13
+105,14
@@
static inline char x86_apicid_to_cpu(char apicid)
if (x86_cpu_to_apicid[i] == apicid)
return i;
if (x86_cpu_to_apicid[i] == apicid)
return i;
+ /* No entries in x86_cpu_to_apicid? Either no MPS|ACPI,
+ * or called too early. Either way, we must be CPU 0. */
+ if (x86_cpu_to_apicid[0] == BAD_APICID)
+ return 0;
+
return -1;
}
return -1;
}
-#define safe_smp_processor_id() (disable_apic ? 0 : x86_apicid_to_cpu(hard_smp_processor_id()))
-
-extern u8 bios_cpu_apicid[];
-
static inline int cpu_present_to_apicid(int mps_cpu)
{
if (mps_cpu < NR_CPUS)
static inline int cpu_present_to_apicid(int mps_cpu)
{
if (mps_cpu < NR_CPUS)
@@
-105,22
+121,8
@@
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 */
#endif /* !ASSEMBLY */
-#define NO_PROC_ID 0xFF /* No processor magic marker */
-
-#endif
-#define INT_DELIVERY_MODE 1 /* logical delivery */
-#define TARGET_CPUS 1
-
-#ifndef ASSEMBLY
-static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
-{
- return cpus_coerce_const(cpumask);
-}
-#endif
-
#ifndef CONFIG_SMP
#define stack_smp_processor_id() 0
#define safe_smp_processor_id() 0
#ifndef CONFIG_SMP
#define stack_smp_processor_id() 0
#define safe_smp_processor_id() 0
@@
-135,5
+137,13
@@
static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
})
#endif
})
#endif
+#ifndef __ASSEMBLY__
+static __inline int logical_smp_processor_id(void)
+{
+ /* we don't want to mark this access volatile - bad code generation */
+ return GET_APIC_LOGICAL_ID(*(unsigned long *)(APIC_BASE+APIC_LDR));
+}
+#endif
+
#endif
#endif