Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1086-2.6.25-xen-Implement-asm-xen_iret.patch

    Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1086-2.6.25-xen-Implement-asm-xen_iret.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: 1751 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 1c03f994392d1c77e9b17e9adff246483082829d Mon Sep 17 00:00:00 2001
    2 From: Eduardo Habkost <ehabkost@redhat.com>
    3 Date: Mon, 11 Feb 2008 11:59:29 -0200
    4 Subject: [PATCH] Implement asm xen_iret
    5
    6 Not optimized yet. Always return through the hypervisor.
    7
    8 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    9 ---
    10 arch/x86/xen/enlighten.c | 4 ++++
    11 arch/x86/xen/xen-asm_64.S | 7 +++++++
    12 arch/x86/xen/xen-ops.h | 1 +
    13 3 files changed, 12 insertions(+), 0 deletions(-)
    14
    15 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
    16 index fcf0554..90d732d 100644
    17 --- a/arch/x86/xen/enlighten.c
    18 +++ b/arch/x86/xen/enlighten.c
    19 @@ -1105,7 +1105,11 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
    20 .read_tsc = native_read_tsc,
    21 .read_pmc = native_read_pmc,
    22
    23 +#ifdef CONFIG_X86_32
    24 .iret = (void *)&hypercall_page[__HYPERVISOR_iret],
    25 +#else
    26 + .iret = xen_iret,
    27 +#endif
    28 .irq_enable_syscall_ret = NULL, /* never called */
    29
    30 .load_tr_desc = paravirt_nop,
    31 diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S
    32 index 38443b8..8f28a91 100644
    33 --- a/arch/x86/xen/xen-asm_64.S
    34 +++ b/arch/x86/xen/xen-asm_64.S
    35 @@ -6,3 +6,10 @@ check_events:
    36 ENTRY(xen_iret_direct)
    37 /*FIXME: implement me! */
    38 ud2a
    39 +
    40 +ENTRY(xen_iret)
    41 + /*FIXME: the VGCF_in_syscall flag need to be handled here */
    42 + pushq $0
    43 + jmp hypercall_page + (__HYPERVISOR_iret * 32)
    44 +END(xen_iret)
    45 +
    46 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
    47 index f062eab..e52bb4c 100644
    48 --- a/arch/x86/xen/xen-ops.h
    49 +++ b/arch/x86/xen/xen-ops.h
    50 @@ -71,4 +71,5 @@ DECL_ASM(unsigned long, xen_save_fl_direct, void);
    51 DECL_ASM(void, xen_restore_fl_direct, unsigned long);
    52
    53 void xen_iret_direct(void);
    54 +void xen_iret(void);
    55 #endif /* XEN_OPS_H */
    56 --
    57 1.5.4.1
    58