summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/step.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-08-18 10:39:47 +0300
committerIngo Molnar <mingo@kernel.org>2015-08-18 10:39:47 +0300
commita5dd19249607474ed680f16b4f5e8477d2b68689 (patch)
tree1aeeef053773c07bc02f3aa637febc80ceb96732 /arch/x86/kernel/step.c
parent6b7e26547fad7ace3dcb27a5babd2317fb9d1e12 (diff)
parent512255a2ad2c832ca7d4de9f31245f73781922d0 (diff)
downloadlinux-a5dd19249607474ed680f16b4f5e8477d2b68689.tar.xz
Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes
Conflicts: arch/x86/entry/entry_64_compat.S arch/x86/math-emu/get_address.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/step.c')
-rw-r--r--arch/x86/kernel/step.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
index fd88e152d584..c9a073866ca7 100644
--- a/arch/x86/kernel/step.c
+++ b/arch/x86/kernel/step.c
@@ -29,11 +29,11 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
struct desc_struct *desc;
unsigned long base;
- seg &= ~7UL;
+ seg >>= 3;
mutex_lock(&child->mm->context.lock);
if (unlikely(!child->mm->context.ldt ||
- (seg >> 3) >= child->mm->context.ldt->size))
+ seg >= child->mm->context.ldt->size))
addr = -1L; /* bogus selector, access would fault */
else {
desc = &child->mm->context.ldt->entries[seg];