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-i386
/
mach-es7000
/
mach_apic.h
diff --git
a/include/asm-i386/mach-es7000/mach_apic.h
b/include/asm-i386/mach-es7000/mach_apic.h
index
ceab2c4
..
2633368
100644
(file)
--- a/
include/asm-i386/mach-es7000/mach_apic.h
+++ b/
include/asm-i386/mach-es7000/mach_apic.h
@@
-38,8
+38,6
@@
static inline cpumask_t target_cpus(void)
#define WAKE_SECONDARY_VIA_INIT
#endif
#define WAKE_SECONDARY_VIA_INIT
#endif
-#define NO_IOAPIC_CHECK (1)
-
static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
{
return 0;
static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
{
return 0;
@@
-125,9
+123,13
@@
extern u8 cpu_2_logical_apicid[];
/* Mapping from cpu number to logical apicid */
static inline int cpu_to_logical_apicid(int cpu)
{
/* Mapping from cpu number to logical apicid */
static inline int cpu_to_logical_apicid(int cpu)
{
+#ifdef CONFIG_SMP
if (cpu >= NR_CPUS)
return BAD_APICID;
return (int)cpu_2_logical_apicid[cpu];
if (cpu >= NR_CPUS)
return BAD_APICID;
return (int)cpu_2_logical_apicid[cpu];
+#else
+ return logical_smp_processor_id();
+#endif
}
static inline int mpc_apic_id(struct mpc_config_processor *m, struct mpc_config_translation *unused)
}
static inline int mpc_apic_id(struct mpc_config_processor *m, struct mpc_config_translation *unused)