George Dunlap
2012-Jan-24 16:09 UTC
[PATCH 1 of 2] xenoprof: Use uint64_t explicitly for internal calls
A recent changeset to make XENOPROF_ESCAPE_CODE consistent across
32- and 64-bit builds caused a build failure, because values were
passed through functions as "unsigned long". Replace these with
uint64_t explicitly.
Also remove redundant function prototype from perfmon.c, now that
it''s in a header file.
Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
diff -r 370924e204dc -r dc346270f1aa xen/arch/ia64/xen/oprofile/perfmon.c
--- a/xen/arch/ia64/xen/oprofile/perfmon.c Mon Jan 23 15:10:43 2012 +0000
+++ b/xen/arch/ia64/xen/oprofile/perfmon.c Tue Jan 24 16:09:14 2012 +0000
@@ -38,8 +38,6 @@
#include <asm/vmx.h> /* for vmx_user_mode() */
// XXX move them to an appropriate header file
-extern void xenoprof_log_event(struct vcpu *vcpu, struct pt_regs * regs,
- unsigned long eip, int mode, int event);
extern int is_active(struct domain *d);
static int allow_virq;
diff -r 370924e204dc -r dc346270f1aa xen/common/xenoprof.c
--- a/xen/common/xenoprof.c Mon Jan 23 15:10:43 2012 +0000
+++ b/xen/common/xenoprof.c Tue Jan 24 16:09:14 2012 +0000
@@ -475,7 +475,7 @@ static int xenoprof_buf_space(struct dom
/* Check for space and add a sample. Return 1 if successful, 0 otherwise. */
static int xenoprof_add_sample(struct domain *d, xenoprof_buf_t *buf,
- unsigned long eip, int mode, int event)
+ uint64_t eip, int mode, int event)
{
int head, tail, size;
@@ -512,7 +512,7 @@ static int xenoprof_add_sample(struct do
}
int xenoprof_add_trace(struct domain *d, struct vcpu *vcpu,
- unsigned long eip, int mode)
+ uint64_t eip, int mode)
{
xenoprof_buf_t *buf = d->xenoprof->vcpu[vcpu->vcpu_id].buffer;
@@ -527,7 +527,7 @@ int xenoprof_add_trace(struct domain *d,
}
void xenoprof_log_event(struct vcpu *vcpu,
- struct cpu_user_regs * regs, unsigned long eip,
+ struct cpu_user_regs * regs, uint64_t eip,
int mode, int event)
{
struct domain *d = vcpu->domain;
diff -r 370924e204dc -r dc346270f1aa xen/include/xen/xenoprof.h
--- a/xen/include/xen/xenoprof.h Mon Jan 23 15:10:43 2012 +0000
+++ b/xen/include/xen/xenoprof.h Tue Jan 24 16:09:14 2012 +0000
@@ -69,7 +69,7 @@ int is_passive(struct domain *d);
void free_xenoprof_pages(struct domain *d);
int xenoprof_add_trace(struct domain *d, struct vcpu *v,
- unsigned long eip, int mode);
+ uint64_t eip, int mode);
#define PMU_OWNER_NONE 0
#define PMU_OWNER_XENOPROF 1
@@ -78,7 +78,7 @@ int acquire_pmu_ownship(int pmu_ownershi
void release_pmu_ownship(int pmu_ownership);
void xenoprof_log_event(struct vcpu *vcpu,
- struct cpu_user_regs * regs, unsigned long eip,
+ struct cpu_user_regs * regs, uint64_t eip,
int mode, int event);
#endif /* __XEN__XENOPROF_H__ */