diff options
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/bigsmp/apicdef.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/es7000/apicdef.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/mach-default/mach_apicdef.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/numaq/apicdef.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/summit/apicdef.h | 2 |
5 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/include/asm/bigsmp/apicdef.h b/arch/x86/include/asm/bigsmp/apicdef.h index 6e587818c7e..e58dee84757 100644 --- a/arch/x86/include/asm/bigsmp/apicdef.h +++ b/arch/x86/include/asm/bigsmp/apicdef.h | |||
@@ -1,8 +1,6 @@ | |||
1 | #ifndef __ASM_MACH_APICDEF_H | 1 | #ifndef __ASM_MACH_APICDEF_H |
2 | #define __ASM_MACH_APICDEF_H | 2 | #define __ASM_MACH_APICDEF_H |
3 | 3 | ||
4 | #define BIGSMP_APIC_ID_MASK (0xFF<<24) | ||
5 | |||
6 | static inline unsigned bigsmp_get_apic_id(unsigned long x) | 4 | static inline unsigned bigsmp_get_apic_id(unsigned long x) |
7 | { | 5 | { |
8 | return (x >> 24) & 0xFF; | 6 | return (x >> 24) & 0xFF; |
diff --git a/arch/x86/include/asm/es7000/apicdef.h b/arch/x86/include/asm/es7000/apicdef.h index 476da0c7f5c..c74881a7b3d 100644 --- a/arch/x86/include/asm/es7000/apicdef.h +++ b/arch/x86/include/asm/es7000/apicdef.h | |||
@@ -1,8 +1,6 @@ | |||
1 | #ifndef __ASM_ES7000_APICDEF_H | 1 | #ifndef __ASM_ES7000_APICDEF_H |
2 | #define __ASM_ES7000_APICDEF_H | 2 | #define __ASM_ES7000_APICDEF_H |
3 | 3 | ||
4 | #define ES7000_APIC_ID_MASK (0xFF<<24) | ||
5 | |||
6 | static inline unsigned int es7000_get_apic_id(unsigned long x) | 4 | static inline unsigned int es7000_get_apic_id(unsigned long x) |
7 | { | 5 | { |
8 | return (x >> 24) & 0xFF; | 6 | return (x >> 24) & 0xFF; |
diff --git a/arch/x86/include/asm/mach-default/mach_apicdef.h b/arch/x86/include/asm/mach-default/mach_apicdef.h index 8318d121ea6..5141085962d 100644 --- a/arch/x86/include/asm/mach-default/mach_apicdef.h +++ b/arch/x86/include/asm/mach-default/mach_apicdef.h | |||
@@ -6,7 +6,6 @@ | |||
6 | #ifdef CONFIG_X86_64 | 6 | #ifdef CONFIG_X86_64 |
7 | #define SET_APIC_ID(x) (apic->set_apic_id(x)) | 7 | #define SET_APIC_ID(x) (apic->set_apic_id(x)) |
8 | #else | 8 | #else |
9 | #define DEFAULT_APIC_ID_MASK (0x0F<<24) | ||
10 | 9 | ||
11 | static inline unsigned default_get_apic_id(unsigned long x) | 10 | static inline unsigned default_get_apic_id(unsigned long x) |
12 | { | 11 | { |
diff --git a/arch/x86/include/asm/numaq/apicdef.h b/arch/x86/include/asm/numaq/apicdef.h index 6f2cc5df0b1..cd927d5bd50 100644 --- a/arch/x86/include/asm/numaq/apicdef.h +++ b/arch/x86/include/asm/numaq/apicdef.h | |||
@@ -1,8 +1,6 @@ | |||
1 | #ifndef __ASM_NUMAQ_APICDEF_H | 1 | #ifndef __ASM_NUMAQ_APICDEF_H |
2 | #define __ASM_NUMAQ_APICDEF_H | 2 | #define __ASM_NUMAQ_APICDEF_H |
3 | 3 | ||
4 | #define NUMAQ_APIC_ID_MASK (0xF<<24) | ||
5 | |||
6 | static inline unsigned int numaq_get_apic_id(unsigned long x) | 4 | static inline unsigned int numaq_get_apic_id(unsigned long x) |
7 | { | 5 | { |
8 | return (x >> 24) & 0x0F; | 6 | return (x >> 24) & 0x0F; |
diff --git a/arch/x86/include/asm/summit/apicdef.h b/arch/x86/include/asm/summit/apicdef.h index 0373f0c7b5d..c24b0df2dec 100644 --- a/arch/x86/include/asm/summit/apicdef.h +++ b/arch/x86/include/asm/summit/apicdef.h | |||
@@ -1,8 +1,6 @@ | |||
1 | #ifndef __ASM_SUMMIT_APICDEF_H | 1 | #ifndef __ASM_SUMMIT_APICDEF_H |
2 | #define __ASM_SUMMIT_APICDEF_H | 2 | #define __ASM_SUMMIT_APICDEF_H |
3 | 3 | ||
4 | #define SUMMIT_APIC_ID_MASK (0xFF<<24) | ||
5 | |||
6 | static inline unsigned summit_get_apic_id(unsigned long x) | 4 | static inline unsigned summit_get_apic_id(unsigned long x) |
7 | { | 5 | { |
8 | return (x >> 24) & 0xFF; | 6 | return (x >> 24) & 0xFF; |