summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-28 15:08:53 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-28 23:20:30 +0100
commit94af18755266edf46803564414d74f9621aaded8 (patch)
tree4b8677f78d7a30271a11e31587540b1e6c073038 /arch/x86/include
parent5b8127277bc4cdca78eda5ee900a314642822ace (diff)
downloadblackbird-op-linux-94af18755266edf46803564414d74f9621aaded8.tar.gz
blackbird-op-linux-94af18755266edf46803564414d74f9621aaded8.zip
x86, apic: get rid of *_APIC_ID_MASK definitions
Impact: cleanup Remove the *_APIC_ID_MASK subarch definitions and move them straight to the genapic driver initialization code. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/bigsmp/apicdef.h2
-rw-r--r--arch/x86/include/asm/es7000/apicdef.h2
-rw-r--r--arch/x86/include/asm/mach-default/mach_apicdef.h1
-rw-r--r--arch/x86/include/asm/numaq/apicdef.h2
-rw-r--r--arch/x86/include/asm/summit/apicdef.h2
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 6e587818c7ed..e58dee847573 100644
--- a/arch/x86/include/asm/bigsmp/apicdef.h
+++ b/arch/x86/include/asm/bigsmp/apicdef.h
@@ -1,8 +1,6 @@
#ifndef __ASM_MACH_APICDEF_H
#define __ASM_MACH_APICDEF_H
-#define BIGSMP_APIC_ID_MASK (0xFF<<24)
-
static inline unsigned bigsmp_get_apic_id(unsigned long x)
{
return (x >> 24) & 0xFF;
diff --git a/arch/x86/include/asm/es7000/apicdef.h b/arch/x86/include/asm/es7000/apicdef.h
index 476da0c7f5cc..c74881a7b3d8 100644
--- a/arch/x86/include/asm/es7000/apicdef.h
+++ b/arch/x86/include/asm/es7000/apicdef.h
@@ -1,8 +1,6 @@
#ifndef __ASM_ES7000_APICDEF_H
#define __ASM_ES7000_APICDEF_H
-#define ES7000_APIC_ID_MASK (0xFF<<24)
-
static inline unsigned int es7000_get_apic_id(unsigned long x)
{
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 8318d121ea66..5141085962d3 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 @@
#ifdef CONFIG_X86_64
#define SET_APIC_ID(x) (apic->set_apic_id(x))
#else
-#define DEFAULT_APIC_ID_MASK (0x0F<<24)
static inline unsigned default_get_apic_id(unsigned long x)
{
diff --git a/arch/x86/include/asm/numaq/apicdef.h b/arch/x86/include/asm/numaq/apicdef.h
index 6f2cc5df0b15..cd927d5bd505 100644
--- a/arch/x86/include/asm/numaq/apicdef.h
+++ b/arch/x86/include/asm/numaq/apicdef.h
@@ -1,8 +1,6 @@
#ifndef __ASM_NUMAQ_APICDEF_H
#define __ASM_NUMAQ_APICDEF_H
-#define NUMAQ_APIC_ID_MASK (0xF<<24)
-
static inline unsigned int numaq_get_apic_id(unsigned long x)
{
return (x >> 24) & 0x0F;
diff --git a/arch/x86/include/asm/summit/apicdef.h b/arch/x86/include/asm/summit/apicdef.h
index 0373f0c7b5db..c24b0df2dec6 100644
--- a/arch/x86/include/asm/summit/apicdef.h
+++ b/arch/x86/include/asm/summit/apicdef.h
@@ -1,8 +1,6 @@
#ifndef __ASM_SUMMIT_APICDEF_H
#define __ASM_SUMMIT_APICDEF_H
-#define SUMMIT_APIC_ID_MASK (0xFF<<24)
-
static inline unsigned summit_get_apic_id(unsigned long x)
{
return (x >> 24) & 0xFF;
OpenPOWER on IntegriCloud