From a23004ee0add07e15bb3eba3304f730f15de82cf Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Wed, 30 Jan 2008 13:30:50 +0100
Subject: [PATCH] --- yaml --- r: 79869 b: refs/heads/master c:
 3f80c1adc900769f2070432419da3b5ddbf066fc h: refs/heads/master i:   79867:
 6ed03a14672695cd6e67b9f957ff2b4cc7284526 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kernel/step.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7b240aebecc8..79c29f466963 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa1e03eae2f38e7b38095301b043da9c274d2284
+refs/heads/master: 3f80c1adc900769f2070432419da3b5ddbf066fc
diff --git a/trunk/arch/x86/kernel/step.c b/trunk/arch/x86/kernel/step.c
index cb3c8bc2939a..3b70f20f21f9 100644
--- a/trunk/arch/x86/kernel/step.c
+++ b/trunk/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;