diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-09-22 15:43:40 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 13:01:14 +0200 |
| commit | b9a3c9344d92dd1979b69c2f7730195e920c2281 (patch) | |
| tree | 139fa4c1d1c7f9b0e74aa773e2e58db9d157c457 /arch | |
| parent | 3d0ec28a9a3530c6db4fa7acdbd25caeae44cea3 (diff) | |
ARM: ux500: Save/restore localtimers context
Change-Id: Ie7c60fbf61024fb80bb7b2c1857df5b0bb607d62
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32134
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ux500/pm/context.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/pm/context.c b/arch/arm/mach-ux500/pm/context.c index ad794a53d35..b2b119c1c6c 100644 --- a/arch/arm/mach-ux500/pm/context.c +++ b/arch/arm/mach-ux500/pm/context.c @@ -26,6 +26,7 @@ #include <mach/context.h> #include <asm/hardware/gic.h> +#include <asm/smp_twd.h> #include "scu.h" #include "../product.h" @@ -825,9 +826,11 @@ void context_varm_save_core(void) per_cpu(varm_cp15_pointer, cpu) = per_cpu(varm_cp15_backup_stack, cpu); /* Save core */ + twd_save(); save_gic_if_cpu(&per_cpu(context_gic_cpu, cpu)); save_gic_dist_cpu(&per_cpu(context_gic_dist_cpu, cpu)); context_save_cp15_registers(&per_cpu(varm_cp15_pointer, cpu)); + } /* @@ -844,6 +847,7 @@ void context_varm_restore_core(void) context_restore_cp15_registers(&per_cpu(varm_cp15_pointer, cpu)); restore_gic_dist_cpu(&per_cpu(context_gic_dist_cpu, cpu)); restore_gic_if_cpu(&per_cpu(context_gic_cpu, cpu)); + twd_restore(); atomic_notifier_call_chain(&context_arm_notifier_list, CONTEXT_ARM_CORE_RESTORE, NULL); |