Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1042-2.6.25-xen-More-chainsaw-ifdefs.patch

    Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1042-2.6.25-xen-More-chainsaw-ifdefs.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: 1640 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 db80140931aa2ae0536fab28e5aebd24e8256239 Mon Sep 17 00:00:00 2001
    2 From: Eduardo Habkost <ehabkost@redhat.com>
    3 Date: Wed, 28 Nov 2007 17:54:25 -0200
    4 Subject: [PATCH] More chainsaw-ifdefs
    5
    6 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    7 ---
    8 arch/x86/xen/events.c | 11 ++++++++++-
    9 arch/x86/xen/mmu.c | 5 +++++
    10 2 files changed, 15 insertions(+), 1 deletions(-)
    11
    12 diff --git a/arch/x86/xen/events.c b/arch/x86/xen/events.c
    13 index dcf613e..fa67e61 100644
    14 --- a/arch/x86/xen/events.c
    15 +++ b/arch/x86/xen/events.c
    16 @@ -456,6 +456,12 @@ void xen_send_IPI_one(unsigned int cpu, enum ipi_vector vector)
    17 }
    18
    19
    20 +/*FIXME: ugly */
    21 +#ifdef CONFIG_X86_64
    22 +extern asmlinkage unsigned int do_IRQ(struct pt_regs *regs);
    23 +#endif
    24 +
    25 +
    26 /*
    27 * Search the CPUs pending events bitmasks. For each one found, map
    28 * the event number to an irq, and feed it into do_IRQ() for
    29 @@ -587,5 +593,8 @@ void __init xen_init_IRQ(void)
    30 for (i = 0; i < NR_IRQS; i++)
    31 irq_bindcount[i] = 0;
    32
    33 - irq_ctx_init(smp_processor_id());
    34 +#ifdef CONFIG_X86_32
    35 + /*FIXME: investigate this better */
    36 + irq_ctx_init(smp_processor_id());
    37 +#endif
    38 }
    39 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
    40 index 4ec41ce..d4742df 100644
    41 --- a/arch/x86/xen/mmu.c
    42 +++ b/arch/x86/xen/mmu.c
    43 @@ -526,7 +526,12 @@ static void drop_other_mm_ref(void *info)
    44 {
    45 struct mm_struct *mm = info;
    46
    47 +#ifdef CONFIG_X86_32
    48 + /*FIXME: better way to do this, avoiding #ifdefs */
    49 if (__get_cpu_var(cpu_tlbstate).active_mm == mm)
    50 +#else
    51 + if (read_pda(active_mm) == mm)
    52 +#endif
    53 leave_mm(smp_processor_id());
    54
    55 /* If this cpu still has a stale cr3 reference, then make sure
    56 --
    57 1.5.4.1
    58