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-i386
/
mach-default
/
mach_apic.h
diff --git
a/include/asm-i386/mach-default/mach_apic.h
b/include/asm-i386/mach-default/mach_apic.h
index
5111b01
..
627f1cd
100644
(file)
--- a/
include/asm-i386/mach-default/mach_apic.h
+++ b/
include/asm-i386/mach-default/mach_apic.h
@@
-2,15
+2,16
@@
#define __ASM_MACH_APIC_H
#include <mach_apicdef.h>
#define __ASM_MACH_APIC_H
#include <mach_apicdef.h>
+#include <asm/smp.h>
#define APIC_DFR_VALUE (APIC_DFR_FLAT)
#define APIC_DFR_VALUE (APIC_DFR_FLAT)
-static inline cpumask_
const_
t target_cpus(void)
+static inline cpumask_t target_cpus(void)
{
#ifdef CONFIG_SMP
{
#ifdef CONFIG_SMP
- return
mk_cpumask_const(cpu_online_map)
;
+ return
cpu_online_map
;
#else
#else
- return
mk_cpumask_const(cpumask_of_cpu(0)
);
+ return
cpumask_of_cpu(0
);
#endif
}
#define TARGET_CPUS (target_cpus())
#endif
}
#define TARGET_CPUS (target_cpus())
@@
-23,12
+24,6
@@
static inline cpumask_const_t target_cpus(void)
#define INT_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */
#define INT_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */
-/*
- * this isn't really broadcast, just a (potentially inaccurate) upper
- * bound for valid physical APIC id's
- */
-#define APIC_BROADCAST_ID 0x0F
-
static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
{
return physid_isset(apicid, bitmap);
static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
{
return physid_isset(apicid, bitmap);
@@
-85,7
+80,10
@@
static inline int cpu_to_logical_apicid(int cpu)
static inline int cpu_present_to_apicid(int mps_cpu)
{
static inline int cpu_present_to_apicid(int mps_cpu)
{
- return mps_cpu;
+ if (mps_cpu < get_physical_broadcast())
+ return mps_cpu;
+ else
+ return BAD_APICID;
}
static inline physid_mask_t apicid_to_cpu_present(int phys_apicid)
}
static inline physid_mask_t apicid_to_cpu_present(int phys_apicid)
@@
-118,9
+116,9
@@
static inline int apic_id_registered(void)
return physid_isset(GET_APIC_ID(apic_read(APIC_ID)), phys_cpu_present_map);
}
return physid_isset(GET_APIC_ID(apic_read(APIC_ID)), phys_cpu_present_map);
}
-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]
;
}
static inline void enable_apic_mode(void)
}
static inline void enable_apic_mode(void)