diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-03-21 18:14:07 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:21 -0400 |
commit | 9b967106da0357ef8b08847dce35584a04134f20 (patch) | |
tree | 01af76543489f2f15621403273bf9f6a742e9366 /include/asm-x86/mach-default/mach_apicdef.h | |
parent | 288621e32a7ae3a29c37b45297136c0264e2ff7b (diff) |
x86: fix smpboot integration
> yhlu@mpk:~/xx/xx/kernel/x86/linux-2.6> git-bisect bad
> d1c707188ad646c8094cac9afb1738e7d0196ff2 is first bad commit
> commit d1c707188ad646c8094cac9afb1738e7d0196ff2
> Author: Glauber de Oliveira Costa <gcosta@redhat.com>
> Date: Wed Mar 19 14:25:53 2008 -0300
>
> x86: include mach_apic.h in smpboot_64.c and smpboot.c
>
> After the inclusion, a lot of files needs fixing for conflicts,
> some of them in the headers themselves, to accomodate for both
> i386 and x86_64 versions.
>
> [ mingo@elte.hu: build fix ]
>
> Signed-off-by: Glauber Costa <gcosta@redhat.com>
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
>
> :040000 040000 19f574e64bb8003bbe984f3a8c1315db969dfdcd
> 6ffe96588c77bc936705599fa110107856201115 M arch
> :040000 040000 61269347ad4f384ed85cc87c4f2d004ed94492ac
> 8f5c713da25579a3cdf63db3d4c2f795261d0521 M include
> yhlu@mpk:~/xx/xx/kernel/x86/linux-2.6>
>
attached patch fixes that.
Diffstat (limited to 'include/asm-x86/mach-default/mach_apicdef.h')
-rw-r--r-- | include/asm-x86/mach-default/mach_apicdef.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/mach-default/mach_apicdef.h b/include/asm-x86/mach-default/mach_apicdef.h index 7b78275e6d33..e4b29ba37de6 100644 --- a/include/asm-x86/mach-default/mach_apicdef.h +++ b/include/asm-x86/mach-default/mach_apicdef.h | |||
@@ -5,13 +5,12 @@ | |||
5 | 5 | ||
6 | #ifdef CONFIG_X86_64 | 6 | #ifdef CONFIG_X86_64 |
7 | #define APIC_ID_MASK (0xFFu<<24) | 7 | #define APIC_ID_MASK (0xFFu<<24) |
8 | #define GET_APIC_ID(x) (((x)>>24)&0xFFu) | ||
8 | #define SET_APIC_ID(x) (((x)<<24)) | 9 | #define SET_APIC_ID(x) (((x)<<24)) |
9 | #else | 10 | #else |
10 | #define APIC_ID_MASK (0xF<<24) | 11 | #define APIC_ID_MASK (0xF<<24) |
11 | #endif | ||
12 | |||
13 | static inline unsigned get_apic_id(unsigned long x) | 12 | static inline unsigned get_apic_id(unsigned long x) |
14 | { | 13 | { |
15 | unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR)); | 14 | unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR)); |
16 | if (APIC_XAPIC(ver)) | 15 | if (APIC_XAPIC(ver)) |
17 | return (((x)>>24)&0xFF); | 16 | return (((x)>>24)&0xFF); |
@@ -20,5 +19,6 @@ static inline unsigned get_apic_id(unsigned long x) | |||
20 | } | 19 | } |
21 | 20 | ||
22 | #define GET_APIC_ID(x) get_apic_id(x) | 21 | #define GET_APIC_ID(x) get_apic_id(x) |
22 | #endif | ||
23 | 23 | ||
24 | #endif | 24 | #endif |