diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-09-04 23:52:33 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-09-04 23:52:33 -0400 |
| commit | f1e0477a7b7a541f51eea279910eed4ddd010033 (patch) | |
| tree | 552841f13496306f0140d5faca82ae9987a81b5e /arch/x86/kernel/step.c | |
| parent | b58c580d996655658975aa8042b43b7d579f3986 (diff) | |
| parent | 9e79e3e9dd9672b37ac9412e9a926714306551fe (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/x86/kernel/step.c')
| -rw-r--r-- | arch/x86/kernel/step.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c index 7977f0cfe339..c346d1161488 100644 --- a/arch/x86/kernel/step.c +++ b/arch/x86/kernel/step.c | |||
| @@ -74,7 +74,7 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs) | |||
| 74 | 74 | ||
| 75 | #ifdef CONFIG_X86_64 | 75 | #ifdef CONFIG_X86_64 |
| 76 | case 0x40 ... 0x4f: | 76 | case 0x40 ... 0x4f: |
| 77 | if (regs->cs != __USER_CS) | 77 | if (!user_64bit_mode(regs)) |
| 78 | /* 32-bit mode: register increment */ | 78 | /* 32-bit mode: register increment */ |
| 79 | return 0; | 79 | return 0; |
| 80 | /* 64-bit mode: REX prefix */ | 80 | /* 64-bit mode: REX prefix */ |