diff options
| author | George Dunlap <george.dunlap@eu.citrix.com> | 2012-01-26 11:03:23 +0000 |
|---|---|---|
| committer | George Dunlap <george.dunlap@eu.citrix.com> | 2012-01-26 11:03:23 +0000 |
| commit | b2341cfbf927ef33a48a1390e54d88a731524c94 (patch) | |
| tree | af9ceeb8ff8bfb531d6e52754d4509e6bade38dc /xen | |
| parent | 8311d176ea6ff5b6251434d4eface16bc5490eb9 (diff) | |
| download | xen-b2341cfbf927ef33a48a1390e54d88a731524c94.tar.gz xen-b2341cfbf927ef33a48a1390e54d88a731524c94.tar.bz2 xen-b2341cfbf927ef33a48a1390e54d88a731524c94.zip | |
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>
Committed-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen')
| -rw-r--r-- | xen/arch/ia64/xen/oprofile/perfmon.c | 2 | ||||
| -rw-r--r-- | xen/common/xenoprof.c | 6 | ||||
| -rw-r--r-- | xen/include/xen/xenoprof.h | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/xen/arch/ia64/xen/oprofile/perfmon.c b/xen/arch/ia64/xen/oprofile/perfmon.c index 26fb693aeb..ada2b2c488 100644 --- a/xen/arch/ia64/xen/oprofile/perfmon.c +++ b/xen/arch/ia64/xen/oprofile/perfmon.c @@ -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 --git a/xen/common/xenoprof.c b/xen/common/xenoprof.c index e790c8ceff..ae5eb25f93 100644 --- a/xen/common/xenoprof.c +++ b/xen/common/xenoprof.c @@ -475,7 +475,7 @@ static int xenoprof_buf_space(struct domain *d, xenoprof_buf_t * buf, int size) /* 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 domain *d, xenoprof_buf_t *buf, } 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, struct vcpu *vcpu, } 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 --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h index 845ea86011..e34ad20ab3 100644 --- a/xen/include/xen/xenoprof.h +++ b/xen/include/xen/xenoprof.h @@ -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_ownership); 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__ */ |