Magellan Linux

Contents of /tags/kernel26-xen-2_6_25_r1-fedora9-patches/kernel26-xen/patches-2.6.25-r1/1143-2.6.25-xen-syscall-related-Xen-ifdefs-FIXME.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 608 - (show annotations) (download)
Fri May 23 12:17:32 2008 UTC (16 years ago) by (unknown author)
File size: 1571 byte(s)
This commit was manufactured by cvs2svn to create tag
'kernel26-xen-2_6_25_r1-fedora9-patches'.
1 From c652961120a42fdcb31b2817e8d0863b1bfbcac9 Mon Sep 17 00:00:00 2001
2 From: Eduardo Habkost <ehabkost@redhat.com>
3 Date: Mon, 4 Feb 2008 17:38:24 -0200
4 Subject: [PATCH] syscall-related Xen #ifdefs (FIXME)
5
6 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
7 ---
8 arch/x86/kernel/entry_64.S | 14 ++++++++++++++
9 1 files changed, 14 insertions(+), 0 deletions(-)
10
11 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
12 index 7961d22..215b16d 100644
13 --- a/arch/x86/kernel/entry_64.S
14 +++ b/arch/x86/kernel/entry_64.S
15 @@ -96,20 +96,29 @@ ENTRY(native_irq_enable_syscall_ret)
16
17 /* %rsp:at FRAMEEND */
18 .macro FIXUP_TOP_OF_STACK tmp
19 +#ifndef CONFIG_XEN
20 + /*FIXME: check this at runtime */
21 movq %gs:pda_oldrsp,\tmp
22 movq \tmp,RSP(%rsp)
23 +#endif
24 movq $__USER_DS,SS(%rsp)
25 movq $__USER_CS,CS(%rsp)
26 movq $-1,RCX(%rsp)
27 +#ifndef CONFIG_XEN
28 + /*FIXME: check this at runtime */
29 movq R11(%rsp),\tmp /* get eflags */
30 movq \tmp,EFLAGS(%rsp)
31 +#endif
32 .endm
33
34 .macro RESTORE_TOP_OF_STACK tmp,offset=0
35 +#ifndef CONFIG_XEN
36 + /*FIXME: check this at runtime */
37 movq RSP-\offset(%rsp),\tmp
38 movq \tmp,%gs:pda_oldrsp
39 movq EFLAGS-\offset(%rsp),\tmp
40 movq \tmp,R11-\offset(%rsp)
41 +#endif
42 .endm
43
44 .macro FAKE_STACK_FRAME child_rip
45 @@ -288,7 +297,12 @@ sysret_check:
46 TRACE_IRQS_ON
47 movq RIP-ARGOFFSET(%rsp),%rcx
48 CFI_REGISTER rip,rcx
49 +#ifndef CONFIG_XEN
50 + /*FIXME: change this at runtime */
51 RESTORE_ARGS 0,-ARG_SKIP,1
52 +#else
53 + RESTORE_ARGS 0,8,0
54 +#endif
55 /*CFI_REGISTER rflags,r11*/
56 ENABLE_INTERRUPTS_SYSCALL_RET
57
58 --
59 1.5.4.1
60