diff options
author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-04-11 09:29:00 +0100 |
---|---|---|
committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-04-11 09:29:00 +0100 |
commit | 30fbfa471fdd06beeb95d201005ddde36dcc9205 (patch) | |
tree | 0ab38efe2056e6f16671826eae42fd3fc95218d8 | |
parent | fc91db2baf8316ee6bb7c4c505917c121d4bdb21 (diff) | |
download | xen-30fbfa471fdd06beeb95d201005ddde36dcc9205.tar.gz xen-30fbfa471fdd06beeb95d201005ddde36dcc9205.tar.bz2 xen-30fbfa471fdd06beeb95d201005ddde36dcc9205.zip |
PV-on-HVM: Fixes for module loading.
Signed-off-by: Keir Fraser <keir@xensource.com>
-rw-r--r-- | linux-2.6-xen-sparse/drivers/xen/core/gnttab.c | 1 | ||||
-rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/evtchn.c | 2 | ||||
-rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/platform-compat.c | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c index e462d5333b..b63ddecfd0 100644 --- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c +++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c @@ -617,7 +617,6 @@ int __devinit gnttab_init(void) gnttab_free_count = nr_init_grefs - NR_RESERVED_ENTRIES; gnttab_free_head = NR_RESERVED_ENTRIES; - printk("Grant table initialized\n"); return 0; ini_nomem: diff --git a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c index 8373056999..64bd7ca3ea 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c +++ b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c @@ -67,7 +67,7 @@ static int alloc_xen_irq(void) spin_lock(&irq_alloc_lock); - for (irq = 0; irq < ARRAY_SIZE(irq_evtchn); irq++) { + for (irq = 1; irq < ARRAY_SIZE(irq_evtchn); irq++) { if (irq_evtchn[irq].inuse) continue; irq_evtchn[irq].inuse = 1; diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c b/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c index 574b118754..2b35c5c757 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c @@ -12,11 +12,10 @@ static int system_state = 1; EXPORT_SYMBOL(system_state); #endif -static inline void ctrl_alt_del(void) +void ctrl_alt_del(void) { kill_proc(1, SIGINT, 1); /* interrupt init */ } -EXPORT_SYMBOL(ctrl_alt_del); #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) size_t strcspn(const char *s, const char *reject) |