Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 167446
b: refs/heads/master
c: d1705c5
h: refs/heads/master
v: v3
  • Loading branch information
H. Peter Anvin committed Oct 12, 2009
1 parent 6100d2c commit d04aadc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7a4b7e5e741fe0a72a517b0367a2659aa53f7c44
refs/heads/master: d1705c558c95418378b11a0be963fe1b3e2fa381
3 changes: 2 additions & 1 deletion trunk/arch/x86/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ unsigned long profile_pc(struct pt_regs *regs)
#ifdef CONFIG_FRAME_POINTER
return *(unsigned long *)(regs->bp + sizeof(long));
#else
unsigned long *sp = (unsigned long *)regs->sp;
unsigned long *sp =
(unsigned long *)kernel_stack_pointer(regs);
/*
* Return address is either directly at stack pointer
* or above a saved flags. Eflags has bits 22-31 zero,
Expand Down

0 comments on commit d04aadc

Please sign in to comment.