Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1096-2.6.25-xen-ifdef-chainsaw-on-syscall_init-FIXME.patch

    Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1096-2.6.25-xen-ifdef-chainsaw-on-syscall_init-FIXME.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 606 - (show annotations) (download)
    Thu May 22 23:13:13 2008 UTC (16 years ago) by niro
    File size: 1342 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 d58ed3742f3b9d01014c1dddfbfd9b43c73b10fb Mon Sep 17 00:00:00 2001
    2 From: Eduardo Habkost <ehabkost@redhat.com>
    3 Date: Fri, 4 Jan 2008 11:39:15 -0200
    4 Subject: [PATCH] ifdef chainsaw on syscall_init() (FIXME)
    5
    6 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    7 ---
    8 arch/x86/kernel/setup64.c | 5 +++++
    9 1 files changed, 5 insertions(+), 0 deletions(-)
    10
    11 diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c
    12 index 2cb06bf..7d06197 100644
    13 --- a/arch/x86/kernel/setup64.c
    14 +++ b/arch/x86/kernel/setup64.c
    15 @@ -163,6 +163,8 @@ extern asmlinkage void ignore_sysret(void);
    16 /* May not be marked __init: used by software suspend */
    17 void syscall_init(void)
    18 {
    19 +#ifndef CONFIG_XEN
    20 + /*FIXME: handle this using pvops */
    21 /*
    22 * LSTAR and STAR live in a bit strange symbiosis.
    23 * They both write to the same internal register. STAR allows to set CS/DS
    24 @@ -171,14 +173,17 @@ void syscall_init(void)
    25 wrmsrl(MSR_STAR, ((u64)__USER32_CS)<<48 | ((u64)__KERNEL_CS)<<32);
    26 wrmsrl(MSR_LSTAR, system_call);
    27 wrmsrl(MSR_CSTAR, ignore_sysret);
    28 +#endif
    29
    30 #ifdef CONFIG_IA32_EMULATION
    31 syscall32_cpu_init ();
    32 #endif
    33
    34 +#ifndef CONFIG_XEN
    35 /* Flags to clear on syscall */
    36 wrmsrl(MSR_SYSCALL_MASK,
    37 X86_EFLAGS_TF|X86_EFLAGS_DF|X86_EFLAGS_IF|X86_EFLAGS_IOPL);
    38 +#endif
    39 }
    40
    41 void __cpuinit check_efer(void)
    42 --
    43 1.5.4.1
    44