summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2008-01-30 13:30:50 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:30:50 +0100
commit3f80c1adc900769f2070432419da3b5ddbf066fc (patch)
tree66a11f2eb81892ae5b978e485f0f2060ad4b49e3 /arch/x86/kernel
parentx86: single_step moved (diff)
downloadlinux-3f80c1adc900769f2070432419da3b5ddbf066fc.tar.xz
linux-3f80c1adc900769f2070432419da3b5ddbf066fc.zip
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')
-rw-r--r--arch/x86/kernel/step.c4
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 @@
#include <linux/mm.h>
#include <linux/ptrace.h>
-#define LDT_SEGMENT 4
-
unsigned long convert_rip_to_linear(struct task_struct *child, struct pt_regs *regs)
{
unsigned long addr, seg;
@@ -20,7 +18,7 @@ unsigned long convert_rip_to_linear(struct task_struct *child, struct pt_regs *r
* TLS segments are used for data, and the PNPBIOS
* and APM bios ones we just ignore here.
*/
- if (seg & LDT_SEGMENT) {
+ if ((seg & SEGMENT_TI_MASK) == SEGMENT_LDT) {
u32 *desc;
unsigned long base;