Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1091-2.6.25-xen-specific-ifdef-hacks-on-kernel-entry_64.S-FIXM.patch

    Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1091-2.6.25-xen-specific-ifdef-hacks-on-kernel-entry_64.S-FIXM.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: 1088 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 ac08118201ee71c67427b1ad1c2f78fd7b67f31e Mon Sep 17 00:00:00 2001
    2 From: Eduardo Habkost <ehabkost@redhat.com>
    3 Date: Mon, 11 Feb 2008 12:02:07 -0200
    4 Subject: [PATCH] Xen-specific #ifdef hacks on kernel/entry_64.S (FIXME)
    5
    6 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    7 ---
    8 arch/x86/kernel/entry_64.S | 9 +++++++++
    9 1 files changed, 9 insertions(+), 0 deletions(-)
    10
    11 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
    12 index d026834..db76caa 100644
    13 --- a/arch/x86/kernel/entry_64.S
    14 +++ b/arch/x86/kernel/entry_64.S
    15 @@ -922,13 +922,22 @@ error_sti:
    16 call *%rax
    17 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
    18 error_exit:
    19 +#ifndef CONFIG_XEN
    20 + /*FIXME: select at runtime */
    21 movl %ebx,%eax
    22 +#endif
    23 RESTORE_REST
    24 DISABLE_INTERRUPTS(CLBR_NONE)
    25 TRACE_IRQS_OFF
    26 GET_THREAD_INFO(%rcx)
    27 +#ifndef CONFIG_XEN
    28 + /*FIXME: select at runtime */
    29 testl %eax,%eax
    30 jne retint_kernel
    31 +#else
    32 + testb $3,CS-ARGOFFSET(%rsp)
    33 + jz retint_kernel
    34 +#endif
    35 LOCKDEP_SYS_EXIT_IRQ
    36 movl threadinfo_flags(%rcx),%edx
    37 movl $_TIF_WORK_MASK,%edi
    38 --
    39 1.5.4.1
    40