diff options
| author | Robbie VanVossen <robert.vanvossen@dornerworks.com> | 2013-03-06 17:08:08 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-03-06 17:08:08 +0100 |
| commit | 17b65c793ca5e924f355d433945d868b4427ea12 (patch) | |
| tree | 25bd8fb66ea3bd3e1ad8524884d9f8bd9ac549de | |
| parent | 9ada00228b18db21bc2fab5557b3a73be2bc47b4 (diff) | |
| download | xen-17b65c793ca5e924f355d433945d868b4427ea12.tar.gz xen-17b65c793ca5e924f355d433945d868b4427ea12.tar.bz2 xen-17b65c793ca5e924f355d433945d868b4427ea12.zip | |
change arguments of do_kexec_op and compat_set_timer_op prototypes
... to match the actual functions.
Signed-off-by: Robbie VanVossen <robert.vanvossen@dornerworks.com>
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@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
| -rw-r--r-- | xen/common/kexec.c | 1 | ||||
| -rw-r--r-- | xen/common/schedule.c | 1 | ||||
| -rw-r--r-- | 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 7b04c1cff4..1ba85564db 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 de111105c4..5f677c36f8 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 7c3d71949d..a9e522937d 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 |