Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 30475
b: refs/heads/master
c: 2b28592
h: refs/heads/master
i:
  30473: e754c83
  30471: aec1974
v: v3
  • Loading branch information
bibo,mao authored and Linus Torvalds committed Jun 26, 2006
1 parent 13dfe8a commit 40551a9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a813ce432f27c4f5011c7b5ac9d2bbbfeb41d9a7
refs/heads/master: 2b28592b07223d7fc0691ce3fe57d495dc9cbe3a
14 changes: 7 additions & 7 deletions trunk/arch/x86_64/kernel/i8259.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
BI(x,8) BI(x,9) BI(x,a) BI(x,b) \
BI(x,c) BI(x,d) BI(x,e) BI(x,f)

#define BUILD_14_IRQS(x) \
#define BUILD_15_IRQS(x) \
BI(x,0) BI(x,1) BI(x,2) BI(x,3) \
BI(x,4) BI(x,5) BI(x,6) BI(x,7) \
BI(x,8) BI(x,9) BI(x,a) BI(x,b) \
BI(x,c) BI(x,d)
BI(x,c) BI(x,d) BI(x,e)

/*
* ISA PIC or low IO-APIC triggered (INTA-cycle or APIC) interrupts:
Expand All @@ -73,13 +73,13 @@ BUILD_16_IRQS(0x8) BUILD_16_IRQS(0x9) BUILD_16_IRQS(0xa) BUILD_16_IRQS(0xb)
BUILD_16_IRQS(0xc) BUILD_16_IRQS(0xd)

#ifdef CONFIG_PCI_MSI
BUILD_14_IRQS(0xe)
BUILD_15_IRQS(0xe)
#endif

#endif

#undef BUILD_16_IRQS
#undef BUILD_14_IRQS
#undef BUILD_15_IRQS
#undef BI


Expand All @@ -92,11 +92,11 @@ BUILD_16_IRQS(0xc) BUILD_16_IRQS(0xd)
IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \
IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f)

#define IRQLIST_14(x) \
#define IRQLIST_15(x) \
IRQ(x,0), IRQ(x,1), IRQ(x,2), IRQ(x,3), \
IRQ(x,4), IRQ(x,5), IRQ(x,6), IRQ(x,7), \
IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \
IRQ(x,c), IRQ(x,d)
IRQ(x,c), IRQ(x,d), IRQ(x,e)

void (*interrupt[NR_IRQS])(void) = {
IRQLIST_16(0x0),
Expand All @@ -108,7 +108,7 @@ void (*interrupt[NR_IRQS])(void) = {
IRQLIST_16(0xc), IRQLIST_16(0xd)

#ifdef CONFIG_PCI_MSI
, IRQLIST_14(0xe)
, IRQLIST_15(0xe)
#endif

#endif
Expand Down

0 comments on commit 40551a9

Please sign in to comment.