Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1094-2.6.25-xen-Use-apic_xen-on-genapic-by-default-FIXME.patch

    Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1094-2.6.25-xen-Use-apic_xen-on-genapic-by-default-FIXME.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: 1457 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 de9d2e8c81ea41d80f574654aa7fc15f01acb983 Mon Sep 17 00:00:00 2001
    2 From: Eduardo Habkost <ehabkost@redhat.com>
    3 Date: Wed, 23 Jan 2008 13:37:35 -0200
    4 Subject: [PATCH] Use apic_xen on genapic, by default (FIXME)
    5
    6 Needs to be handled at runtime.
    7
    8 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    9 ---
    10 arch/x86/kernel/genapic_64.c | 12 ++++++++++++
    11 1 files changed, 12 insertions(+), 0 deletions(-)
    12
    13 diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c
    14 index 4ae7b64..d983406 100644
    15 --- a/arch/x86/kernel/genapic_64.c
    16 +++ b/arch/x86/kernel/genapic_64.c
    17 @@ -31,13 +31,24 @@ void *x86_cpu_to_apicid_early_ptr;
    18 DEFINE_PER_CPU(u16, x86_cpu_to_apicid) = BAD_APICID;
    19 EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);
    20
    21 +
    22 +#ifdef CONFIG_XEN
    23 +/*FIXME: move to the proper header file */
    24 +extern struct genapic apic_xen;
    25 +struct genapic __read_mostly *genapic = &apic_xen;
    26 +#else
    27 struct genapic __read_mostly *genapic = &apic_flat;
    28 +#endif
    29
    30 /*
    31 * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
    32 */
    33 void __init setup_apic_routing(void)
    34 {
    35 +#ifdef CONFIG_XEN
    36 + /*FIXME: handle this at runtime */
    37 + genapic = &apic_xen;
    38 +#else
    39 #ifdef CONFIG_ACPI
    40 /*
    41 * Quirk: some x86_64 machines can only use physical APIC mode
    42 @@ -55,6 +66,7 @@ void __init setup_apic_routing(void)
    43 else
    44 genapic = &apic_physflat;
    45
    46 +#endif /* CONFIG_XEN else */
    47 printk(KERN_INFO "Setting APIC routing to %s\n", genapic->name);
    48 }
    49
    50 --
    51 1.5.4.1
    52