[Xen-changelog] [xen-unstable] PV-on-HVM: Fixes for module loading.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1176280140 -3600
# Node ID 6e7ef794cdbc1e9ad83e93945a4ece01daebeb0a
# Parent  5d7fb634ec1a1c127316ccb2cacbf473c8c77377
PV-on-HVM: Fixes for module loading.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/drivers/xen/core/gnttab.c              |    1 -
 unmodified_drivers/linux-2.6/platform-pci/evtchn.c          |    2 +-
 unmodified_drivers/linux-2.6/platform-pci/platform-compat.c |    3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff -r 5d7fb634ec1a -r 6e7ef794cdbc 
linux-2.6-xen-sparse/drivers/xen/core/gnttab.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c    Wed Apr 11 09:16:04 
2007 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c    Wed Apr 11 09:29:00 
2007 +0100
@@ -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 -r 5d7fb634ec1a -r 6e7ef794cdbc 
unmodified_drivers/linux-2.6/platform-pci/evtchn.c
--- a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c        Wed Apr 11 
09:16:04 2007 +0100
+++ b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c        Wed Apr 11 
09:29:00 2007 +0100
@@ -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 -r 5d7fb634ec1a -r 6e7ef794cdbc 
unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c       Wed Apr 
11 09:16:04 2007 +0100
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c       Wed Apr 
11 09:29:00 2007 +0100
@@ -12,11 +12,10 @@ EXPORT_SYMBOL(system_state);
 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)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog