git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
mpspec.h
diff --git
a/arch/x86/include/asm/mpspec.h
b/arch/x86/include/asm/mpspec.h
index
c82868e
..
0c90dd9
100644
(file)
--- a/
arch/x86/include/asm/mpspec.h
+++ b/
arch/x86/include/asm/mpspec.h
@@
-5,8
+5,9
@@
#include <asm/mpspec_def.h>
#include <asm/x86_init.h>
#include <asm/mpspec_def.h>
#include <asm/x86_init.h>
+#include <asm/apicdef.h>
-extern int apic_version[
MAX_APICS
];
+extern int apic_version[];
extern int pic_mode;
#ifdef CONFIG_X86_32
extern int pic_mode;
#ifdef CONFIG_X86_32
@@
-107,7
+108,7
@@
extern int mp_register_gsi(struct device *dev, u32 gsi, int edge_level,
int active_high_low);
#endif /* CONFIG_ACPI */
int active_high_low);
#endif /* CONFIG_ACPI */
-#define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_
APICS
)
+#define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_
LOCAL_APIC
)
struct physid_mask {
unsigned long mask[PHYSID_ARRAY_SIZE];
struct physid_mask {
unsigned long mask[PHYSID_ARRAY_SIZE];
@@
-122,31
+123,31
@@
typedef struct physid_mask physid_mask_t;
test_and_set_bit(physid, (map).mask)
#define physids_and(dst, src1, src2) \
test_and_set_bit(physid, (map).mask)
#define physids_and(dst, src1, src2) \
- bitmap_and((dst).mask, (src1).mask, (src2).mask, MAX_
APICS
)
+ bitmap_and((dst).mask, (src1).mask, (src2).mask, MAX_
LOCAL_APIC
)
#define physids_or(dst, src1, src2) \
#define physids_or(dst, src1, src2) \
- bitmap_or((dst).mask, (src1).mask, (src2).mask, MAX_
APICS
)
+ bitmap_or((dst).mask, (src1).mask, (src2).mask, MAX_
LOCAL_APIC
)
#define physids_clear(map) \
#define physids_clear(map) \
- bitmap_zero((map).mask, MAX_
APICS
)
+ bitmap_zero((map).mask, MAX_
LOCAL_APIC
)
#define physids_complement(dst, src) \
#define physids_complement(dst, src) \
- bitmap_complement((dst).mask, (src).mask, MAX_
APICS
)
+ bitmap_complement((dst).mask, (src).mask, MAX_
LOCAL_APIC
)
#define physids_empty(map) \
#define physids_empty(map) \
- bitmap_empty((map).mask, MAX_
APICS
)
+ bitmap_empty((map).mask, MAX_
LOCAL_APIC
)
#define physids_equal(map1, map2) \
#define physids_equal(map1, map2) \
- bitmap_equal((map1).mask, (map2).mask, MAX_
APICS
)
+ bitmap_equal((map1).mask, (map2).mask, MAX_
LOCAL_APIC
)
#define physids_weight(map) \
#define physids_weight(map) \
- bitmap_weight((map).mask, MAX_
APICS
)
+ bitmap_weight((map).mask, MAX_
LOCAL_APIC
)
#define physids_shift_right(d, s, n) \
#define physids_shift_right(d, s, n) \
- bitmap_shift_right((d).mask, (s).mask, n, MAX_
APICS
)
+ bitmap_shift_right((d).mask, (s).mask, n, MAX_
LOCAL_APIC
)
#define physids_shift_left(d, s, n) \
#define physids_shift_left(d, s, n) \
- bitmap_shift_left((d).mask, (s).mask, n, MAX_
APICS
)
+ bitmap_shift_left((d).mask, (s).mask, n, MAX_
LOCAL_APIC
)
static inline unsigned long physids_coerce(physid_mask_t *map)
{
static inline unsigned long physids_coerce(physid_mask_t *map)
{
@@
-159,14
+160,6
@@
static inline void physids_promote(unsigned long physids, physid_mask_t *map)
map->mask[0] = physids;
}
map->mask[0] = physids;
}
-/* Note: will create very large stack frames if physid_mask_t is big */
-#define physid_mask_of_physid(physid) \
- ({ \
- physid_mask_t __physid_mask = PHYSID_MASK_NONE; \
- physid_set(physid, __physid_mask); \
- __physid_mask; \
- })
-
static inline void physid_set_mask_of_physid(int physid, physid_mask_t *map)
{
physids_clear(*map);
static inline void physid_set_mask_of_physid(int physid, physid_mask_t *map)
{
physids_clear(*map);