diff --git a/[refs] b/[refs]
index bcb4f0713a32..0ddf79b29e11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 461ebd109569d666d367f774f74002add6444d49
+refs/heads/master: 2c460d0b6813a5d2a7d571b0b561e4e727036dd7
diff --git a/trunk/arch/x86/kernel/time_32.c b/trunk/arch/x86/kernel/time_32.c
index ca0a4aab12ce..7215bc6adfcc 100644
--- a/trunk/arch/x86/kernel/time_32.c
+++ b/trunk/arch/x86/kernel/time_32.c
@@ -49,7 +49,7 @@ unsigned long profile_pc(struct pt_regs *regs)
 #ifdef CONFIG_SMP
 	if (!user_mode_vm(regs) && in_lock_functions(pc)) {
 #ifdef CONFIG_FRAME_POINTER
-		return *(unsigned long *)(regs->bp + 4);
+		return *(unsigned long *)(regs->bp + sizeof(long));
 #else
 		unsigned long *sp = (unsigned long *)&regs->sp;