# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID c22741d000a5a812ea93c199c3f5a3cc4ab04d4a
# Parent 61b3b357d827ce0d803b7fee2e72e65cfe2aec41
Keep up with recent changes in xen-unstable
diff -r 61b3b357d827 -r c22741d000a5
linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c Thu Sep 29
23:28:44 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c Thu Sep 29
23:29:23 2005
@@ -7,6 +7,9 @@
#include <asm-xen/evtchn.h>
#define MAX_EVTCHN 256
+
+#define VALID_EVTCHN(_chn) ((_chn) >= 0)
+
static struct {
irqreturn_t (*handler)(int, void *, struct pt_regs *);
void *dev_id;
@@ -71,6 +74,14 @@
{
printk("unbind_evtchn_from_irq called... FIXME??\n");
while(1);
+}
+
+void notify_remote_via_irq(int irq)
+{
+ int evtchn = virq_to_evtchn[irq]; // FIXME... is this right??
+
+ if (VALID_EVTCHN(evtchn))
+ notify_remote_via_evtchn(evtchn);
}
irqreturn_t evtchn_interrupt(int irq, void *dev_id, struct pt_regs *regs)
diff -r 61b3b357d827 -r c22741d000a5
linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/gnttab.c.patch
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/gnttab.c.patch Thu Sep
29 23:28:44 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/gnttab.c.patch Thu Sep
29 23:29:23 2005
@@ -1,7 +1,7 @@
diff -Naur xen/core/gnttab.c xen.patched/core/gnttab.c
--- xen/core/gnttab.c 2005-09-23 10:54:50.000000000 -0600
+++ xen.patched/core/gnttab.c 2005-09-23 10:57:51.000000000 -0600
-@@ -22,6 +22,10 @@
+@@ -19,6 +19,10 @@
#include <asm-xen/gnttab.h>
#include <asm/synch_bitops.h>
@@ -10,59 +10,59 @@
+#endif
+
#if 1
- #define ASSERT(_p) \
- if ( !(_p) ) { printk(KERN_ALERT"Assertion '%s': line %d, file %s\n", \
-@@ -339,6 +343,10 @@
- if ( hypercall.op != __HYPERVISOR_grant_table_op )
- return -ENOSYS;
+ #define ASSERT(_p) \
+ if ( !(_p) ) { printk(KERN_ALERT"Assertion '%s': line %d, file %s\n", \
+@@ -346,6 +350,10 @@
+ if ( hypercall.op != __HYPERVISOR_grant_table_op )
+ return -ENOSYS;
+
+#ifdef __ia64__
-+ ret = HYPERVISOR_grant_table_op(hypercall.arg[0], (void
*)hypercall.arg[1], hypercall.arg[2]);
++ ret = HYPERVISOR_grant_table_op(hypercall.arg[0], (void
*)hypercall.arg[1], hypercall.arg[2]);
+#else
- /* hypercall-invoking asm taken from privcmd.c */
- __asm__ __volatile__ (
- "pushl %%ebx; pushl %%ecx; pushl %%edx; pushl %%esi; pushl %%edi; "
-@@ -351,6 +359,7 @@
- TRAP_INSTR "; "
- "popl %%edi; popl %%esi; popl %%edx; popl %%ecx; popl %%ebx"
- : "=a" (ret) : "0" (&hypercall) : "memory" );
+ /* hypercall-invoking asm taken from privcmd.c */
+ __asm__ __volatile__ (
+ "pushl %%ebx; pushl %%ecx; pushl %%edx; "
+@@ -359,6 +367,7 @@
+ TRAP_INSTR "; "
+ "popl %%edi; popl %%esi; popl %%edx; popl %%ecx; popl %%ebx"
+ : "=a" (ret) : "0" (&hypercall) : "memory" );
+#endif
- return ret;
+ return ret;
}
-@@ -414,8 +423,13 @@
- BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1) != 0);
- BUG_ON(setup.status != 0);
+@@ -423,8 +432,13 @@
+ BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1));
+ BUG_ON(setup.status != 0);
+#ifdef __ia64__
-+ shared = __va(frames[0] << PAGE_SHIFT);
-+ printk("grant table at %p\n", shared);
++ shared = __va(frames[0] << PAGE_SHIFT);
++ printk("grant table at %p\n", shared);
+#else
- for ( i = 0; i < NR_GRANT_FRAMES; i++ )
- set_fixmap(FIX_GNTTAB_END - i, frames[i] << PAGE_SHIFT);
+ for (i = 0; i < NR_GRANT_FRAMES; i++)
+ set_fixmap(FIX_GNTTAB_END - i, frames[i] << PAGE_SHIFT);
+#endif
- return 0;
+ return 0;
}
-@@ -425,8 +439,10 @@
+@@ -434,8 +448,10 @@
{
- int i;
+ int i;
+#ifndef __ia64__
- for ( i = 0; i < NR_GRANT_FRAMES; i++ )
- clear_fixmap(FIX_GNTTAB_END - i);
+ for (i = 0; i < NR_GRANT_FRAMES; i++)
+ clear_fixmap(FIX_GNTTAB_END - i);
+#endif
- return 0;
+ return 0;
}
-@@ -441,7 +457,9 @@
+@@ -450,7 +466,9 @@
- BUG_ON(gnttab_resume());
+ BUG_ON(gnttab_resume());
+#ifndef __ia64__
- shared = (grant_entry_t *)fix_to_virt(FIX_GNTTAB_END);
+ shared = (grant_entry_t *)fix_to_virt(FIX_GNTTAB_END);
+#endif
- for ( i = 0; i < NR_GRANT_ENTRIES; i++ )
- gnttab_list[i] = i + 1;
+ for (i = NR_RESERVED_ENTRIES; i < NR_GRANT_ENTRIES; i++)
+ gnttab_list[i] = i + 1;
diff -r 61b3b357d827 -r c22741d000a5
linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c Thu Sep 29
23:28:44 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c Thu Sep 29
23:29:23 2005
@@ -45,4 +45,8 @@
return (unsigned long)vma->addr;
}
+
+/* These should be define'd but some drivers use them without
+ * a convenient arch include */
+unsigned long mfn_to_pfn(unsigned long mfn) { return mfn; }
#endif
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home