Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 113525
b: refs/heads/master
c: 2c44e66
h: refs/heads/master
i:
  113523: 1ba03c1
v: v3
  • Loading branch information
Glauber Costa authored and Ingo Molnar committed Oct 13, 2008
1 parent 15df9d2 commit 90e0447
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 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: cf4cfb225ab2b48611cb4f9e8db23c87486416d6
refs/heads/master: 2c44e66843cd50c5ef4f4271fbd63a4f4bf4d083
3 changes: 1 addition & 2 deletions trunk/arch/x86/kernel/time_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ unsigned long profile_pc(struct pt_regs *regs)
unsigned long pc = instruction_pointer(regs);

#ifdef CONFIG_SMP
if (!v8086_mode(regs) && !user_mode(regs) &&
in_lock_functions(pc)) {
if (!user_mode_vm(regs) && in_lock_functions(pc)) {
#ifdef CONFIG_FRAME_POINTER
return *(unsigned long *)(regs->bp + 4);
#else
Expand Down

0 comments on commit 90e0447

Please sign in to comment.