diff options
| author | emellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com> | 2005-10-17 14:12:20 +0100 |
|---|---|---|
| committer | emellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com> | 2005-10-17 14:12:20 +0100 |
| commit | dcd2f1cf1fb61742d669a959f552c774f36eb832 (patch) | |
| tree | 79985ceee04ae028be25e738a07e7be6e04e29eb | |
| parent | 238ca03bd451220cc54549ac860b452766a2d9c4 (diff) | |
| parent | 689c39e019d8adb9d2e9f7db3911e4db87536e76 (diff) | |
| download | xen-dcd2f1cf1fb61742d669a959f552c774f36eb832.tar.gz xen-dcd2f1cf1fb61742d669a959f552c774f36eb832.tar.bz2 xen-dcd2f1cf1fb61742d669a959f552c774f36eb832.zip | |
Merged.
| -rw-r--r-- | linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c index cb0e1f9783..80e017684b 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c +++ b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c @@ -42,6 +42,7 @@ #include <asm-xen/xen-public/physdev.h> #include <asm/hypervisor.h> #include <asm-xen/evtchn.h> +#include <linux/mc146818rtc.h> /* RTC_IRQ */ /* * This lock protects updates to the following mapping and reference-count @@ -744,6 +745,13 @@ void __init init_IRQ(void) { irq_bindcount[pirq_to_irq(i)] = 1; +#ifdef RTC_IRQ + /* If not domain 0, force our RTC driver to fail its probe. */ + if ((i == RTC_IRQ) && + !(xen_start_info->flags & SIF_INITDOMAIN)) + continue; +#endif + irq_desc[pirq_to_irq(i)].status = IRQ_DISABLED; irq_desc[pirq_to_irq(i)].action = 0; irq_desc[pirq_to_irq(i)].depth = 1; |