diff options
-rw-r--r-- | arch/x86/include/asm/irq_vectors.h | 9 | ||||
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h index dbc81acb7e93..585a42810cf8 100644 --- a/arch/x86/include/asm/irq_vectors.h +++ b/arch/x86/include/asm/irq_vectors.h | |||
@@ -133,11 +133,12 @@ | |||
133 | #define MCE_SELF_VECTOR 0xeb | 133 | #define MCE_SELF_VECTOR 0xeb |
134 | 134 | ||
135 | /* | 135 | /* |
136 | * First APIC vector available to drivers: (vectors 0x30-0xee) we | 136 | * First APIC vector available to drivers: (vectors 0x30-0xee). We |
137 | * start at 0x31 to spread out vectors evenly between priority | 137 | * start allocating at 0x31 to spread out vectors evenly between |
138 | * levels. (0x80 is the syscall vector) | 138 | * priority levels. (0x80 is the syscall vector) |
139 | */ | 139 | */ |
140 | #define FIRST_DEVICE_VECTOR (IRQ15_VECTOR + 2) | 140 | #define FIRST_DEVICE_VECTOR (IRQ15_VECTOR + 1) |
141 | #define VECTOR_OFFSET_START 1 | ||
141 | 142 | ||
142 | #define NR_VECTORS 256 | 143 | #define NR_VECTORS 256 |
143 | 144 | ||
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index d9cd1f1b9c07..e9ba0903e9d5 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
@@ -1162,7 +1162,8 @@ __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask) | |||
1162 | * Also, we've got to be careful not to trash gate | 1162 | * Also, we've got to be careful not to trash gate |
1163 | * 0x80, because int 0x80 is hm, kind of importantish. ;) | 1163 | * 0x80, because int 0x80 is hm, kind of importantish. ;) |
1164 | */ | 1164 | */ |
1165 | static int current_vector = FIRST_DEVICE_VECTOR, current_offset = 0; | 1165 | static int current_vector = FIRST_DEVICE_VECTOR + VECTOR_OFFSET_START; |
1166 | static int current_offset = VECTOR_OFFSET_START % 8; | ||
1166 | unsigned int old_vector; | 1167 | unsigned int old_vector; |
1167 | int cpu, err; | 1168 | int cpu, err; |
1168 | cpumask_var_t tmp_mask; | 1169 | cpumask_var_t tmp_mask; |