diff options
author | Roland McGrath <roland@redhat.com> | 2008-01-30 07:30:50 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:50 -0500 |
commit | 3f80c1adc900769f2070432419da3b5ddbf066fc (patch) | |
tree | 66a11f2eb81892ae5b978e485f0f2060ad4b49e3 /arch/x86/kernel/step.c | |
parent | fa1e03eae2f38e7b38095301b043da9c274d2284 (diff) |
x86: single_step segment macros
This cleans up the single-step code to use the asm/segment.h macros
for segment selector magic bits, rather than its own constant.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/step.c')
-rw-r--r-- | arch/x86/kernel/step.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c index cb3c8bc2939a..3b70f20f21f9 100644 --- a/arch/x86/kernel/step.c +++ b/arch/x86/kernel/step.c | |||
@@ -5,8 +5,6 @@ | |||
5 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
6 | #include <linux/ptrace.h> | 6 | #include <linux/ptrace.h> |
7 | 7 | ||
8 | #define LDT_SEGMENT 4 | ||
9 | |||
10 | unsigned long convert_rip_to_linear(struct task_struct *child, struct pt_regs *regs) | 8 | unsigned long convert_rip_to_linear(struct task_struct *child, struct pt_regs *regs) |
11 | { | 9 | { |
12 | unsigned long addr, seg; | 10 | unsigned long addr, seg; |
@@ -20,7 +18,7 @@ unsigned long convert_rip_to_linear(struct task_struct *child, struct pt_regs *r | |||
20 | * TLS segments are used for data, and the PNPBIOS | 18 | * TLS segments are used for data, and the PNPBIOS |
21 | * and APM bios ones we just ignore here. | 19 | * and APM bios ones we just ignore here. |
22 | */ | 20 | */ |
23 | if (seg & LDT_SEGMENT) { | 21 | if ((seg & SEGMENT_TI_MASK) == SEGMENT_LDT) { |
24 | u32 *desc; | 22 | u32 *desc; |
25 | unsigned long base; | 23 | unsigned long base; |
26 | 24 | ||