Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1153-2.6.25-xen-Set-pvops-machine_ops-for-Xen-on-x86_64-also-MERGE.patch

    Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1153-2.6.25-xen-Set-pvops-machine_ops-for-Xen-on-x86_64-also-MERGE.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: 1073 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 6cfc89e3eccabe7dfb8bb55d01deab7e0006e89f Mon Sep 17 00:00:00 2001
    2 From: Eduardo Habkost <ehabkost@redhat.com>
    3 Date: Fri, 25 Apr 2008 11:59:45 -0300
    4 Subject: [PATCH] Set pvops machine_ops for Xen on x86_64 also (MERGEME)
    5
    6 I don't know why this code was commented out, in the first place. Maybe
    7 machine_ops wasn't supported on x86_64 when I started working on this
    8 code.
    9
    10 This should be merged with the commit that commented out the code
    11 (that means both commits wil probably go away :)
    12
    13 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    14 ---
    15 arch/x86/xen/enlighten.c | 3 ---
    16 1 files changed, 0 insertions(+), 3 deletions(-)
    17
    18 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
    19 index 1a72632..5509f11 100644
    20 --- a/arch/x86/xen/enlighten.c
    21 +++ b/arch/x86/xen/enlighten.c
    22 @@ -1406,10 +1406,7 @@ asmlinkage void __init xen_start_kernel(void)
    23 pv_apic_ops = xen_apic_ops;
    24 pv_mmu_ops = xen_mmu_ops;
    25
    26 -#ifdef CONFIG_X86_32
    27 - /*FIXME: implement me! */
    28 machine_ops = xen_machine_ops;
    29 -#endif
    30
    31 #ifdef CONFIG_SMP
    32 smp_ops = xen_smp_ops;
    33 --
    34 1.5.4.1
    35