diff options
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/pm-cps.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/smp-cps.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c index c409a5aef8ab..06147179a175 100644 --- a/arch/mips/kernel/pm-cps.c +++ b/arch/mips/kernel/pm-cps.c | |||
@@ -154,7 +154,7 @@ int cps_pm_enter_state(enum cps_pm_state state) | |||
154 | return -EINVAL; | 154 | return -EINVAL; |
155 | 155 | ||
156 | core_cfg = &mips_cps_core_bootcfg[core]; | 156 | core_cfg = &mips_cps_core_bootcfg[core]; |
157 | vpe_cfg = &core_cfg->vpe_config[current_cpu_data.vpe_id]; | 157 | vpe_cfg = &core_cfg->vpe_config[cpu_vpe_id(¤t_cpu_data)]; |
158 | vpe_cfg->pc = (unsigned long)mips_cps_pm_restore; | 158 | vpe_cfg->pc = (unsigned long)mips_cps_pm_restore; |
159 | vpe_cfg->gp = (unsigned long)current_thread_info(); | 159 | vpe_cfg->gp = (unsigned long)current_thread_info(); |
160 | vpe_cfg->sp = 0; | 160 | vpe_cfg->sp = 0; |
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c index 949f2c6827a0..f9b53b4eaccb 100644 --- a/arch/mips/kernel/smp-cps.c +++ b/arch/mips/kernel/smp-cps.c | |||
@@ -360,7 +360,7 @@ void play_dead(void) | |||
360 | static void wait_for_sibling_halt(void *ptr_cpu) | 360 | static void wait_for_sibling_halt(void *ptr_cpu) |
361 | { | 361 | { |
362 | unsigned cpu = (unsigned)ptr_cpu; | 362 | unsigned cpu = (unsigned)ptr_cpu; |
363 | unsigned vpe_id = cpu_data[cpu].vpe_id; | 363 | unsigned vpe_id = cpu_vpe_id(&cpu_data[cpu]); |
364 | unsigned halted; | 364 | unsigned halted; |
365 | unsigned long flags; | 365 | unsigned long flags; |
366 | 366 | ||