diff --git a/[refs] b/[refs] index 6e2633086503..66144da54a83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 145106e81090fcdfb57b7f2e90b98c6445b6f33d +refs/heads/master: d4d35854a1cf7fb170c8e133a5e40a9d19e7fc17 diff --git a/trunk/arch/x86_64/kernel/ptrace.c b/trunk/arch/x86_64/kernel/ptrace.c index 3a52c7bcfd12..412c6a8bf906 100644 --- a/trunk/arch/x86_64/kernel/ptrace.c +++ b/trunk/arch/x86_64/kernel/ptrace.c @@ -138,7 +138,7 @@ static int is_at_popf(struct task_struct *child, struct pt_regs *regs) case 0x26: case 0x2e: case 0x36: case 0x3e: case 0x64: case 0x65: - case 0xf0: case 0xf2: case 0xf3: + case 0xf2: case 0xf3: continue; case 0x40 ... 0x4f: @@ -148,7 +148,7 @@ static int is_at_popf(struct task_struct *child, struct pt_regs *regs) /* 64-bit mode: REX prefix */ continue; - /* CHECKME: f0, f2, f3 */ + /* CHECKME: f2, f3 */ /* * pushf: NOTE! We should probably not let