diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
| commit | a9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (patch) | |
| tree | 98304395fbb5b9c74fca35b196cd414c1949f280 /arch/arm/kernel/time.c | |
| parent | a8b71a2810386a5ac8f43d2095fe3355f0d8db37 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'arch/arm/kernel/time.c')
| -rw-r--r-- | arch/arm/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 368d171754cf..c68b44aa88d2 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c | |||
| @@ -59,7 +59,7 @@ unsigned long profile_pc(struct pt_regs *regs) | |||
| 59 | 59 | ||
| 60 | if (in_lock_functions(pc)) { | 60 | if (in_lock_functions(pc)) { |
| 61 | fp = regs->ARM_fp; | 61 | fp = regs->ARM_fp; |
| 62 | pc = pc_pointer(((unsigned long *)fp)[-1]); | 62 | pc = ((unsigned long *)fp)[-1]; |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | return pc; | 65 | return pc; |