From 948b1043c3111498c45b57e1e8a6d80ecb6a56f1 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Wed, 25 Jun 2008 00:19:25 -0400 Subject: [PATCH] --- yaml --- r: 99959 b: refs/heads/master c: e04e0a630d8b5c621b3a8e70ff20db737d3a5728 h: refs/heads/master i: 99957: 3b1d9a9a287eef72cfdf66b4039cbdbdaed1176a 99955: 658d16d5d66e1fe0531b2e6c9d3b36a5fa708911 99951: cbf508e92ce5330d4b3be8b275a8dc2d06c2cc46 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bcfbec61be0b..a4266edb5af0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 478de5a9d691dd0c048ddce62dbec23722515636 +refs/heads/master: e04e0a630d8b5c621b3a8e70ff20db737d3a5728 diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S index ff15ab552280..6d1101469e97 100644 --- a/trunk/arch/x86/kernel/entry_64.S +++ b/trunk/arch/x86/kernel/entry_64.S @@ -104,7 +104,7 @@ ENTRY(native_irq_enable_syscall_ret) .macro FAKE_STACK_FRAME child_rip /* push in order ss, rsp, eflags, cs, rip */ xorl %eax, %eax - pushq %rax /* ss */ + pushq $__KERNEL_DS /* ss */ CFI_ADJUST_CFA_OFFSET 8 /*CFI_REL_OFFSET ss,0*/ pushq %rax /* rsp */