diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-06-01 18:13:02 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-06-01 18:25:31 -0400 |
| commit | 48b1fddbb100a64f3983ca9768b8ea629a09aa20 (patch) | |
| tree | 7cf552c623cb0aa0dd945df55b7eaf5a0697e277 /arch/x86/include/asm/irq_remapping.h | |
| parent | 38736072d45488fd45f076388b6570419bbbc682 (diff) | |
| parent | ee4c24a5c9b530481394132c8dbc10572d57c075 (diff) | |
Merge branch 'irq/numa' into x86/mce3
Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa
and modified in x86/mce3; this merge resolves the conflict.
Conflicts:
arch/x86/kernel/irqinit.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/irq_remapping.h')
| -rw-r--r-- | arch/x86/include/asm/irq_remapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h index 0396760fccb8..f275e2244505 100644 --- a/arch/x86/include/asm/irq_remapping.h +++ b/arch/x86/include/asm/irq_remapping.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #ifndef _ASM_X86_IRQ_REMAPPING_H | 1 | #ifndef _ASM_X86_IRQ_REMAPPING_H |
| 2 | #define _ASM_X86_IRQ_REMAPPING_H | 2 | #define _ASM_X86_IRQ_REMAPPING_H |
| 3 | 3 | ||
| 4 | #define IRTE_DEST(dest) ((x2apic) ? dest : dest << 8) | 4 | #define IRTE_DEST(dest) ((x2apic_mode) ? dest : dest << 8) |
| 5 | 5 | ||
| 6 | #endif /* _ASM_X86_IRQ_REMAPPING_H */ | 6 | #endif /* _ASM_X86_IRQ_REMAPPING_H */ |