diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:29:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:29:23 -0400 |
| commit | 6dec3a10a7a6093af10cef7ac56021150afd6451 (patch) | |
| tree | f4d8511f023e3e0c203baf889d4a0f3925882381 /include/asm-x86/msidef.h | |
| parent | 29308333fbe2cc61258c1c470f9403960428beb2 (diff) | |
| parent | 10a010f6953b5a14ba2f0be40a4fce1bea220875 (diff) | |
Merge branch 'x86/x2apic' into x86/core
Conflicts:
include/asm-x86/i8259.h
include/asm-x86/msidef.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/msidef.h')
| -rw-r--r-- | include/asm-x86/msidef.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-x86/msidef.h b/include/asm-x86/msidef.h index 3139666a94fa..ed9190246876 100644 --- a/include/asm-x86/msidef.h +++ b/include/asm-x86/msidef.h | |||
| @@ -48,4 +48,8 @@ | |||
| 48 | #define MSI_ADDR_DEST_ID(dest) (((dest) << MSI_ADDR_DEST_ID_SHIFT) & \ | 48 | #define MSI_ADDR_DEST_ID(dest) (((dest) << MSI_ADDR_DEST_ID_SHIFT) & \ |
| 49 | MSI_ADDR_DEST_ID_MASK) | 49 | MSI_ADDR_DEST_ID_MASK) |
| 50 | 50 | ||
| 51 | #define MSI_ADDR_IR_EXT_INT (1 << 4) | ||
| 52 | #define MSI_ADDR_IR_SHV (1 << 3) | ||
| 53 | #define MSI_ADDR_IR_INDEX1(index) ((index & 0x8000) >> 13) | ||
| 54 | #define MSI_ADDR_IR_INDEX2(index) ((index & 0x7fff) << 5) | ||
| 51 | #endif /* ASM_X86__MSIDEF_H */ | 55 | #endif /* ASM_X86__MSIDEF_H */ |