From 403e13ab44263dbb6f949ccf642920dab4edc3d0 Mon Sep 17 00:00:00 2001 From: Kris Van Hees Date: Thu, 17 Oct 2013 05:40:47 -0400 Subject: [PATCH] dtrace: align module code with new cyclics API Orabug: 17553446 Signed-off-by: Kris Van Hees --- dtrace/dtrace_state.c | 4 ++-- dtrace/profile_dev.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dtrace/dtrace_state.c b/dtrace/dtrace_state.c index 4d458cf2cf3f..df9ecc821021 100644 --- a/dtrace/dtrace_state.c +++ b/dtrace/dtrace_state.c @@ -788,7 +788,7 @@ int dtrace_state_go(dtrace_state_t *state, processorid_t *cpu) opt[DTRACEOPT_CLEANRATE] = dtrace_cleanrate_max; hdlr.cyh_func = (cyc_func_t)dtrace_state_clean; - hdlr.cyh_arg = state; + hdlr.cyh_arg = (uintptr_t)state; hdlr.cyh_level = CY_LOW_LEVEL; when.cyt_when = ktime_set(0, 0); @@ -797,7 +797,7 @@ int dtrace_state_go(dtrace_state_t *state, processorid_t *cpu) state->dts_cleaner = cyclic_add(&hdlr, &when); hdlr.cyh_func = (cyc_func_t)dtrace_state_deadman; - hdlr.cyh_arg = state; + hdlr.cyh_arg = (uintptr_t)state; hdlr.cyh_level = CY_LOW_LEVEL; when.cyt_when = ktime_set(0, 0); diff --git a/dtrace/profile_dev.c b/dtrace/profile_dev.c index 655bb748d767..25ec075f2a8e 100644 --- a/dtrace/profile_dev.c +++ b/dtrace/profile_dev.c @@ -89,9 +89,9 @@ static int profile_ticks[] = { static int profile_max; /* maximum number of profile probes */ static atomic_t profile_total; /* current number of profile probes */ -static void profile_tick(void *arg) +static void profile_tick(uintptr_t arg) { - profile_probe_t *prof = arg; + profile_probe_t *prof = (profile_probe_t *)arg; unsigned long pc = 0, upc = 0; #ifdef PROBE_PCS struct pt_regs *regs = get_irq_regs(); @@ -106,9 +106,9 @@ static void profile_tick(void *arg) } #ifdef OMNI_CYCLICS -static void profile_prof(void *arg) +static void profile_prof(uintptr_t arg) { - profile_probe_percpu_t *pcpu = arg; + profile_probe_percpu_t *pcpu = (profile_probe_percpu_t *)arg; profile_probe_t *prof = pcpu->profc_probe; ktime_t late; struct pt_regs *regs = get_irq_regs(); @@ -353,7 +353,7 @@ int _profile_enable(void *arg, dtrace_id_t id, void *parg) if (prof->prof_kind == PROF_TICK) { hdlr.cyh_func = profile_tick; - hdlr.cyh_arg = prof; + hdlr.cyh_arg = (uintptr_t)prof; hdlr.cyh_level = CY_HIGH_LEVEL; when.cyt_interval = prof->prof_interval; @@ -366,7 +366,7 @@ int _profile_enable(void *arg, dtrace_id_t id, void *parg) omni.cyo_online = profile_online; omni.cyo_offline = profile_offline; - omni.cyo_arg = prof; + omni.cyo_arg = (uintptr_t)prof; prof->prof_cyclic = cyclic_add_omni(&omni); #endif -- 2.50.1