[Xen-changelog] [xen master] change arguments of do_kexec_op and compat_set_timer_op prototypes

[patchbot@xxxxxxx]

commit 17b65c793ca5e924f355d433945d868b4427ea12
Author:     Robbie VanVossen <robert.vanvossen@xxxxxxxxxxxxxxx>
AuthorDate: Wed Mar 6 17:08:08 2013 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Mar 6 17:08:08 2013 +0100

    change arguments of do_kexec_op and compat_set_timer_op prototypes
    
    ... to match the actual functions.
    
    Signed-off-by: Robbie VanVossen <robert.vanvossen@xxxxxxxxxxxxxxx>
    
    Also make sure the source files defining these symbols include the
    header declaring them (had we done so, the problem would have been
    noticed long ago).
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Keir Fraser <keir@xxxxxxx>
---
 xen/common/kexec.c          |    1 +
 xen/common/schedule.c       |    1 +
 xen/include/xen/hypercall.h |    6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xen/common/kexec.c b/xen/common/kexec.c
index 7b04c1c..1ba8556 100644
--- a/xen/common/kexec.c
+++ b/xen/common/kexec.c
@@ -15,6 +15,7 @@
 #include <xen/nmi.h>
 #include <xen/sched.h>
 #include <xen/types.h>
+#include <xen/hypercall.h>
 #include <xen/kexec.h>
 #include <xen/keyhandler.h>
 #include <public/kexec.h>
diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index de11110..5f677c3 100644
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -30,6 +30,7 @@
 #include <xen/mm.h>
 #include <xen/err.h>
 #include <xen/guest_access.h>
+#include <xen/hypercall.h>
 #include <xen/multicall.h>
 #include <xen/cpu.h>
 #include <xen/preempt.h>
diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h
index 7c3d719..a9e5229 100644
--- a/xen/include/xen/hypercall.h
+++ b/xen/include/xen/hypercall.h
@@ -126,8 +126,7 @@ do_hvm_op(
 extern long
 do_kexec_op(
     unsigned long op,
-    int arg1,
-    XEN_GUEST_HANDLE_PARAM(void) arg);
+    XEN_GUEST_HANDLE_PARAM(void) uarg);
 
 extern long
 do_xsm_op(
@@ -174,7 +173,8 @@ compat_sched_op(
 
 extern int
 compat_set_timer_op(
-    s_time_t timeout);
+    u32 lo,
+    s32 hi);
 
 #endif
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

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