Skip to content

Commit ff85100

Browse files
H. Peter Anvin (Intel)KAGA-KOKO
authored andcommitted
x86/irq: Add and use NR_EXTERNAL_VECTORS and NR_SYSTEM_VECTORS
Add defines for the number of external vectors and number of system vectors instead of requiring the use of (FIRST_SYSTEM_VECTOR - FIRST_EXTERNAL_VECTOR) and (NR_VECTORS - FIRST_SYSTEM_VECTOR) respectively. Clean up the usage sites. Signed-off-by: H. Peter Anvin (Intel) <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Andy Lutomirski <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent f1b7d45 commit ff85100

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

arch/x86/include/asm/idtentry.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ __visible noinstr void func(struct pt_regs *regs, \
504504
.align 8
505505
SYM_CODE_START(irq_entries_start)
506506
vector=FIRST_EXTERNAL_VECTOR
507-
.rept (FIRST_SYSTEM_VECTOR - FIRST_EXTERNAL_VECTOR)
507+
.rept NR_EXTERNAL_VECTORS
508508
UNWIND_HINT_IRET_REGS
509509
0 :
510510
.byte 0x6a, vector
@@ -520,7 +520,7 @@ SYM_CODE_END(irq_entries_start)
520520
.align 8
521521
SYM_CODE_START(spurious_entries_start)
522522
vector=FIRST_SYSTEM_VECTOR
523-
.rept (NR_VECTORS - FIRST_SYSTEM_VECTOR)
523+
.rept NR_SYSTEM_VECTORS
524524
UNWIND_HINT_IRET_REGS
525525
0 :
526526
.byte 0x6a, vector

arch/x86/include/asm/irq_vectors.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@
114114
#define FIRST_SYSTEM_VECTOR NR_VECTORS
115115
#endif
116116

117+
#define NR_EXTERNAL_VECTORS (FIRST_SYSTEM_VECTOR - FIRST_EXTERNAL_VECTOR)
118+
#define NR_SYSTEM_VECTORS (NR_VECTORS - FIRST_SYSTEM_VECTOR)
119+
117120
/*
118121
* Size the maximum number of interrupts.
119122
*

tools/arch/x86/include/asm/irq_vectors.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@
114114
#define FIRST_SYSTEM_VECTOR NR_VECTORS
115115
#endif
116116

117+
#define NR_EXTERNAL_VECTORS (FIRST_SYSTEM_VECTOR - FIRST_EXTERNAL_VECTOR)
118+
#define NR_SYSTEM_VECTORS (NR_VECTORS - FIRST_SYSTEM_VECTOR)
119+
117120
/*
118121
* Size the maximum number of interrupts.
119122
*

0 commit comments

Comments
 (0)