ia64/xen-unstable
changeset 14802:6e7ef794cdbc
PV-on-HVM: Fixes for module loading.
Signed-off-by: Keir Fraser <keir@xensource.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
author | kfraser@localhost.localdomain |
---|---|
date | Wed Apr 11 09:29:00 2007 +0100 (2007-04-11) |
parents | 5d7fb634ec1a |
children | 5f6bca864d9c 90a6af455bbd |
files | linux-2.6-xen-sparse/drivers/xen/core/gnttab.c unmodified_drivers/linux-2.6/platform-pci/evtchn.c unmodified_drivers/linux-2.6/platform-pci/platform-compat.c |
line diff
1.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c Wed Apr 11 09:16:04 2007 +0100 1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c Wed Apr 11 09:29:00 2007 +0100 1.3 @@ -617,7 +617,6 @@ int __devinit gnttab_init(void) 1.4 gnttab_free_count = nr_init_grefs - NR_RESERVED_ENTRIES; 1.5 gnttab_free_head = NR_RESERVED_ENTRIES; 1.6 1.7 - printk("Grant table initialized\n"); 1.8 return 0; 1.9 1.10 ini_nomem:
2.1 --- a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c Wed Apr 11 09:16:04 2007 +0100 2.2 +++ b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c Wed Apr 11 09:29:00 2007 +0100 2.3 @@ -67,7 +67,7 @@ static int alloc_xen_irq(void) 2.4 2.5 spin_lock(&irq_alloc_lock); 2.6 2.7 - for (irq = 0; irq < ARRAY_SIZE(irq_evtchn); irq++) { 2.8 + for (irq = 1; irq < ARRAY_SIZE(irq_evtchn); irq++) { 2.9 if (irq_evtchn[irq].inuse) 2.10 continue; 2.11 irq_evtchn[irq].inuse = 1;
3.1 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c Wed Apr 11 09:16:04 2007 +0100 3.2 +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c Wed Apr 11 09:29:00 2007 +0100 3.3 @@ -12,11 +12,10 @@ static int system_state = 1; 3.4 EXPORT_SYMBOL(system_state); 3.5 #endif 3.6 3.7 -static inline void ctrl_alt_del(void) 3.8 +void ctrl_alt_del(void) 3.9 { 3.10 kill_proc(1, SIGINT, 1); /* interrupt init */ 3.11 } 3.12 -EXPORT_SYMBOL(ctrl_alt_del); 3.13 3.14 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) 3.15 size_t strcspn(const char *s, const char *reject)