diff options
| author | Gerrit Code Review <gerrit2@git-master.nvidia.com> | 2010-01-21 07:55:52 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git-master.nvidia.com> | 2010-01-21 07:55:52 +0200 |
| commit | 2dc92ce51dfb237fd671133304e48646faf290b1 (patch) | |
| tree | 2ff781d33504c0caf3d39048744706127c51d60b | |
| parent | 5252a652cc1581f3ea1603a6f27ec6a6abf65eb4 (diff) | |
| parent | a98268c877c213c4913b149c52c80b236518e4da (diff) | |
Merge change I510e40be into android-tegra-2.6.29
* changes:
tegra power: Save/Restore the r1 register across save_local_timer call.
| -rw-r--r-- | arch/arm/mach-tegra/power-lp.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/power-lp.S b/arch/arm/mach-tegra/power-lp.S index 48c09640fd30..acc7645e34c1 100644 --- a/arch/arm/mach-tegra/power-lp.S +++ b/arch/arm/mach-tegra/power-lp.S @@ -66,7 +66,9 @@ wait_for_other_cores: beq finish_power_state //Save the local timers + stmfd sp!, {r1} bl save_local_timers + ldmfd sp!, {r1} //Ok we can save state for core0 now save_arm_state: |