diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/xen | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/events.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 036343ba204e..42d6c930cc87 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * domain gets 1024 event channels, but NR_IRQ is not that large, we | 5 | * domain gets 1024 event channels, but NR_IRQ is not that large, we |
| 6 | * must dynamically map irqs<->event channels. The event channels | 6 | * must dynamically map irqs<->event channels. The event channels |
| 7 | * interface with the rest of the kernel by defining a xen interrupt | 7 | * interface with the rest of the kernel by defining a xen interrupt |
| 8 | * chip. When an event is recieved, it is mapped to an irq and sent | 8 | * chip. When an event is received, it is mapped to an irq and sent |
| 9 | * through the normal interrupt processing path. | 9 | * through the normal interrupt processing path. |
| 10 | * | 10 | * |
| 11 | * There are four kinds of events which can be mapped to an event | 11 | * There are four kinds of events which can be mapped to an event |
| @@ -416,7 +416,7 @@ static int __must_check xen_allocate_irq_dynamic(void) | |||
| 416 | #ifdef CONFIG_X86_IO_APIC | 416 | #ifdef CONFIG_X86_IO_APIC |
| 417 | /* | 417 | /* |
| 418 | * For an HVM guest or domain 0 which see "real" (emulated or | 418 | * For an HVM guest or domain 0 which see "real" (emulated or |
| 419 | * actual repectively) GSIs we allocate dynamic IRQs | 419 | * actual respectively) GSIs we allocate dynamic IRQs |
| 420 | * e.g. those corresponding to event channels or MSIs | 420 | * e.g. those corresponding to event channels or MSIs |
| 421 | * etc. from the range above those "real" GSIs to avoid | 421 | * etc. from the range above those "real" GSIs to avoid |
| 422 | * collisions. | 422 | * collisions. |