diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-12 07:30:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-12 07:30:05 +0200 |
| commit | 1ba89386db0a3f39590b90b5dd20d7149ae52de0 (patch) | |
| tree | 7211f558d841cb40e1015d0b7527643ad55cb8e7 /include/asm-x86/mach-visws/mach_apicdef.h | |
| parent | a26929fb489188ff959b1715ee67f0c9f84405b5 (diff) | |
| parent | ae94b8075a2ed58d2318ef03827b25bc844f844e (diff) | |
Merge branch 'x86/core' into x86/x2apic
Diffstat (limited to 'include/asm-x86/mach-visws/mach_apicdef.h')
| -rw-r--r-- | include/asm-x86/mach-visws/mach_apicdef.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/asm-x86/mach-visws/mach_apicdef.h b/include/asm-x86/mach-visws/mach_apicdef.h index 826cfa97d77..42711d152a9 100644 --- a/include/asm-x86/mach-visws/mach_apicdef.h +++ b/include/asm-x86/mach-visws/mach_apicdef.h @@ -1,12 +1 @@ -#ifndef __ASM_MACH_APICDEF_H -#define __ASM_MACH_APICDEF_H - -#define APIC_ID_MASK (0xF<<24) - -static inline unsigned get_apic_id(unsigned long x) -{ - return (((x)>>24)&0xF); -} -#define GET_APIC_ID(x) get_apic_id(x) - -#endif +#include "../mach-default/mach_apicdef.h" |