[REFACTOR] use smp_processor_id() instead of task_cpu()

Change-Id: Ife34a588e055f274e67e8a1e83a03b3f46a5c8f0
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

diff --git a/energy/energy.c b/energy/energy.c
index b5aed42..1617cbd 100644 (file)
--- a/energy/energy.c
+++ b/energy/energy.c
@@ -254,7 +254,7 @@ static int entry_handler_switch(struct kretprobe_instance *ri, struct pt_regs *r
        struct cpus_time* ct;
        struct energy_data *ed;
 
-       cpu = task_cpu(current);
+       cpu = smp_processor_id();
        time = get_ntime();
        ct = current->tgid ? &ed_system.ct : &ct_idle;
        cpus_time_update_running(ct, cpu, time);
@@ -273,7 +273,7 @@ static int ret_handler_switch(struct kretprobe_instance *ri, struct pt_regs *reg
        struct cpus_time* ct;
        struct energy_data *ed;
 
-       cpu = task_cpu(current);
+       cpu = smp_processor_id();
        time = get_ntime();
        ct = current->tgid ? &ed_system.ct : &ct_idle;
        cpus_time_save_entry(ct, cpu, time);

diff --git a/writer/swap_writer_module.c b/writer/swap_writer_module.c
index b710d2f..d2dcd18 100644 (file)
--- a/writer/swap_writer_module.c
+++ b/writer/swap_writer_module.c
@@ -99,7 +99,7 @@ EXPORT_SYMBOL_GPL(get_discarded_count);
 
 static char *get_current_buf(void)
 {
-       return cpu_buf[task_cpu(current)];
+       return cpu_buf[smp_processor_id()];
 }
 
 static inline u64 timespec2time(struct timespec *ts)
@@ -349,7 +349,7 @@ static char *pack_sample(char *payload, struct pt_regs *regs)
        s->pid = task->tgid;
        s->pc_addr = get_regs_ip(regs);
        s->tid = task->pid;
-       s->cpu_num = task_cpu(current);
+       s->cpu_num = smp_processor_id();
 
        return payload + sizeof(*s);
 }
@@ -399,7 +399,7 @@ static char *pack_msg_func_entry(char *payload, const char *fmt, struct pt_regs
 
        mfe->pid = task->tgid;
        mfe->tid = task->pid;
-       mfe->cpu_num = task_cpu(task);
+       mfe->cpu_num = smp_processor_id();
        mfe->pc_addr = get_regs_ip(regs);
 //TODO ret address for x86!
        mfe->caller_pc_addr = get_regs_ret_func(regs);
@@ -556,7 +556,7 @@ static char *pack_msg_func_exit(char *payload, struct pt_regs *regs,
 
        mfe->pid = task->tgid;
        mfe->tid = task->pid;
-       mfe->cpu_num = task_cpu(task);
+       mfe->cpu_num = smp_processor_id();
        mfe->pc_addr = func_addr;
        mfe->caller_pc_addr = ret_addr;
        mfe->ret_val = get_regs_ret_val(regs);
@@ -605,7 +605,7 @@ static char *pack_msg_context_switch(char *payload, struct pt_regs *regs)
        mcs->pc_addr = 0;
        mcs->pid = task->tgid;
        mcs->tid = task->pid;
-       mcs->cpu_num = task_cpu(task);
+       mcs->cpu_num = smp_processor_id();
 
        return payload + sizeof(*mcs);
 }