# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID 0ffa4369cbb304413aa5595e01a676641145a6ce
# Parent 4e0c94871be28ce4936169205430d1cb1b0b451b
Update ia64 to keep up with core changes
diff -r 4e0c94871be2 -r 0ffa4369cbb3
linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
--- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre Sat Oct 8
20:28:24 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre Sat Oct 8
20:28:56 2005
@@ -17,7 +17,7 @@
mv arch/xen arch/xen.xen-x86
mkdir arch/xen
mv arch/xen.xen-x86/configs arch/xen
- mv include/asm-generic include/asm-generic.xen-x86
+# mv include/asm-generic include/asm-generic.xen-x86
mv include/linux include/linux.xen-x86
mkdir include/linux
fi
diff -r 4e0c94871be2 -r 0ffa4369cbb3
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 Sat Oct 8
20:28:24 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c Sat Oct 8
20:28:56 2005
@@ -35,12 +35,18 @@
while(1);
}
+void notify_remote_via_irq(int virq)
+{
+ printk("notify_remote_via_irq called... FIXME??\n");
+ while(1);
+}
+
void unbind_virq_from_evtchn(int virq)
{
evtchn_op_t op;
op.cmd = EVTCHNOP_close;
- op.u.close.dom = DOMID_SELF;
+// op.u.close.dom = DOMID_SELF;
op.u.close.port = virq_to_evtchn[virq];
if ( HYPERVISOR_event_channel_op(&op) != 0 )
BUG();
diff -r 4e0c94871be2 -r 0ffa4369cbb3
linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h Sat Oct
8 20:28:24 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h Sat Oct
8 20:28:56 2005
@@ -48,6 +48,7 @@
// for drivers/xen/privcmd/privcmd.c
#define direct_remap_pfn_range(a,b,c,d,e,f) remap_pfn_range(a,b,c,d,e)
#define pfn_to_mfn(x) (x)
+#define mfn_to_pfn(x) (x)
#define machine_to_phys_mapping 0
#endif /* __HYPERVISOR_H__ */
diff -r 4e0c94871be2 -r 0ffa4369cbb3 xen/arch/ia64/xen/hypercall.c
--- a/xen/arch/ia64/xen/hypercall.c Sat Oct 8 20:28:24 2005
+++ b/xen/arch/ia64/xen/hypercall.c Sat Oct 8 20:28:56 2005
@@ -15,6 +15,7 @@
#include <asm/vcpu.h>
#include <asm/dom_fw.h>
#include <public/memory.h>
+#include <public/sched.h>
extern unsigned long translate_domain_mpaddr(unsigned long);
extern struct ia64_pal_retval xen_pal_emulator(UINT64,UINT64,UINT64,UINT64);
diff -r 4e0c94871be2 -r 0ffa4369cbb3 xen/arch/ia64/xen/xenmisc.c
--- a/xen/arch/ia64/xen/xenmisc.c Sat Oct 8 20:28:24 2005
+++ b/xen/arch/ia64/xen/xenmisc.c Sat Oct 8 20:28:56 2005
@@ -16,6 +16,7 @@
#include <xen/serial.h>
#include <asm/io.h>
#include <xen/softirq.h>
+#include <public/sched.h>
efi_memory_desc_t ia64_efi_io_md;
EXPORT_SYMBOL(ia64_efi_io_md);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home