diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 11:05:51 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 11:05:51 +0200 |
commit | accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6 (patch) | |
tree | 8fb40782e79472ed882ff2098d4dd295557278ee /include/asm-x86/summit/apicdef.h | |
parent | x86/oprofile: reanaming op_model_athlon.c to op_model_amd.c (diff) | |
parent | MAINTAINERS: remove colon from headings (diff) | |
download | linux-accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6.tar.xz linux-accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6.zip |
Merge branch 'linus' into oprofile-v2
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h
Diffstat (limited to 'include/asm-x86/summit/apicdef.h')
-rw-r--r-- | include/asm-x86/summit/apicdef.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/asm-x86/summit/apicdef.h b/include/asm-x86/summit/apicdef.h new file mode 100644 index 000000000000..f3fbca1f61c1 --- /dev/null +++ b/include/asm-x86/summit/apicdef.h @@ -0,0 +1,13 @@ +#ifndef __ASM_SUMMIT_APICDEF_H +#define __ASM_SUMMIT_APICDEF_H + +#define APIC_ID_MASK (0xFF<<24) + +static inline unsigned get_apic_id(unsigned long x) +{ + return (x>>24)&0xFF; +} + +#define GET_APIC_ID(x) get_apic_id(x) + +#endif |