Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1088-2.6.25-xen-Implement-xen_irqenable_syscall_ret.patch

    Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1088-2.6.25-xen-Implement-xen_irqenable_syscall_ret.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 606 - (show annotations) (download)
    Thu May 22 23:13:13 2008 UTC (15 years, 11 months ago) by niro
    File size: 1842 byte(s) 
    -ver bump to 2.6.25-magellan-r1:
- linux-2.6.25.4
- fbcondecor-0.9.4
- squashfs-3.3
- unionfs-2.3.3
- tuxonice-3.0-rc7
- linux-phc-0.3.0
- acpi-dstd-0.9a
- reiser4
- xen-3.2.0
. ipw3945-1.2.2
    1 From 2763ac022ebd765746ccb681cd637ecfa67e5f09 Mon Sep 17 00:00:00 2001
    2 From: Eduardo Habkost <ehabkost@redhat.com>
    3 Date: Mon, 4 Feb 2008 18:06:53 -0200
    4 Subject: [PATCH] Implement xen_irqenable_syscall_ret()
    5
    6 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    7 ---
    8 arch/x86/xen/enlighten.c | 3 ++-
    9 arch/x86/xen/xen-asm_64.S | 8 ++++++++
    10 arch/x86/xen/xen-ops.h | 2 ++
    11 3 files changed, 12 insertions(+), 1 deletions(-)
    12
    13 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
    14 index 90d732d..7633851 100644
    15 --- a/arch/x86/xen/enlighten.c
    16 +++ b/arch/x86/xen/enlighten.c
    17 @@ -1107,10 +1107,11 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
    18
    19 #ifdef CONFIG_X86_32
    20 .iret = (void *)&hypercall_page[__HYPERVISOR_iret],
    21 + .irq_enable_syscall_ret = NULL, /* never called */
    22 #else
    23 .iret = xen_iret,
    24 + .irq_enable_syscall_ret = xen_irqenable_syscall_ret,
    25 #endif
    26 - .irq_enable_syscall_ret = NULL, /* never called */
    27
    28 .load_tr_desc = paravirt_nop,
    29 .set_ldt = xen_set_ldt,
    30 diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S
    31 index 85c235c..9ceaeab 100644
    32 --- a/arch/x86/xen/xen-asm_64.S
    33 +++ b/arch/x86/xen/xen-asm_64.S
    34 @@ -62,3 +62,11 @@ xen_iret_slow:
    35 jmp hypercall_page + (__HYPERVISOR_iret * 32)
    36 END(xen_iret)
    37
    38 +#define VGCF_in_syscall (1<<8)
    39 +
    40 +ENTRY(xen_irqenable_syscall_ret)
    41 + orl $X86_EFLAGS_IF,EFLAGS-IRETOFFSET(%rsp)
    42 +
    43 + pushq $VGCF_in_syscall
    44 + jmp hypercall_page + (__HYPERVISOR_iret * 32)
    45 +END(xen_irqenable_syscall_ret)
    46 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
    47 index e52bb4c..b523062 100644
    48 --- a/arch/x86/xen/xen-ops.h
    49 +++ b/arch/x86/xen/xen-ops.h
    50 @@ -72,4 +72,6 @@ DECL_ASM(void, xen_restore_fl_direct, unsigned long);
    51
    52 void xen_iret_direct(void);
    53 void xen_iret(void);
    54 +void xen_irqenable_syscall_ret(void);
    55 +
    56 #endif /* XEN_OPS_H */
    57 --
    58 1.5.4.1
    59