Le Jeudi 24 Août 2006 00:44, Alex Williamson a écrit :
>    I merged us up with xen-unstable.hg.  For the most part things still
> work well, but there seem to be a few regressions (networking on VTi
> domains is broken again and rebooting domains is less reliable).  I'd
> like to request a pull within the next day or so, therefore please take
> a moment to test as this may be our last pull before 3.0.3.  I'd like to
> include all of the currently outstanding patches, especially the
> pal_halt_light emulation patch, so let's try to get that one figured out
> so that everyone is happy with it.  Thanks,
Hi,

very small patch to avoid compile-time warning.

Tristan.
# HG changeset patch
# User [EMAIL PROTECTED]
# Node ID e85eb1425baaa314ef10cb600c376bba3c9a8298
# Parent  3e54734e55f39419678afd1ce1a9a96669fa69ef
Avoid compile-time warnings.

Signed-off-by: Tristan Gingold <[EMAIL PROTECTED]>

diff -r 3e54734e55f3 -r e85eb1425baa xen/include/asm-ia64/grant_table.h
--- a/xen/include/asm-ia64/grant_table.h	Wed Aug 23 13:26:46 2006 -0600
+++ b/xen/include/asm-ia64/grant_table.h	Thu Aug 24 08:07:26 2006 +0200
@@ -35,7 +35,7 @@ void guest_physmap_add_page(struct domai
                           gnttab_shared_maddr((d), (t), (i)));          \
         (IA64_GRANT_TABLE_PADDR >> PAGE_SHIFT) + (i);})
 
-#define gnttab_mark_dirty(d, f) ((void)0)
+#define gnttab_mark_dirty(d, f) ((void)f)
 
 static inline void gnttab_clear_flag(unsigned long nr, uint16_t *addr)
 {
diff -r 3e54734e55f3 -r e85eb1425baa xen/include/asm-ia64/vmx.h
--- a/xen/include/asm-ia64/vmx.h	Wed Aug 23 13:26:46 2006 -0600
+++ b/xen/include/asm-ia64/vmx.h	Thu Aug 24 08:07:26 2006 +0200
@@ -55,6 +55,7 @@ extern void vmx_relinquish_guest_resourc
 extern void vmx_relinquish_guest_resources(struct domain *d);
 extern void vmx_relinquish_vcpu_resources(struct vcpu *v);
 extern void vmx_die_if_kernel(char *str, struct pt_regs *regs, long err);
+extern void vmx_send_assist_req(struct vcpu *v);
 
 static inline vcpu_iodata_t *get_vio(struct domain *d, unsigned long cpu)
 {
_______________________________________________
Xen-ia64-devel mailing list
[email protected]
http://lists.xensource.com/xen-ia64-devel

Reply via email to