lkml.org 
[lkml]   [2007]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 25/28] From: Jeremy Fitzhardinge <>
    The other symbols used to delineate the alt-instructions sections have the
    form __foo/__foo_end. Rename parainstructions to match.

    Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
    Cc: Andi Kleen <ak@suse.de>
    Cc: Rusty Russell <rusty@rustcorp.com.au>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    ---
    arch/i386/kernel/alternative.c | 2 +-
    arch/i386/kernel/vmi.c | 6 +++---
    arch/i386/kernel/vmlinux.lds.S | 4 ++--
    include/asm-i386/alternative.h | 4 ++--
    4 files changed, 8 insertions(+), 8 deletions(-)

    ===================================================================
    --- a/arch/i386/kernel/alternative.c
    +++ b/arch/i386/kernel/alternative.c
    @@ -386,6 +386,6 @@ void __init alternative_instructions(voi
    alternatives_smp_switch(0);
    }
    #endif
    - apply_paravirt(__start_parainstructions, __stop_parainstructions);
    + apply_paravirt(__parainstructions, __parainstructions_end);
    local_irq_restore(flags);
    }
    ===================================================================
    --- a/arch/i386/kernel/vmi.c
    +++ b/arch/i386/kernel/vmi.c
    @@ -74,8 +74,8 @@ static struct {
    } vmi_ops;

    /* XXX move this to alternative.h */
    -extern struct paravirt_patch __start_parainstructions[],
    - __stop_parainstructions[];
    +extern struct paravirt_patch __parainstructions[],
    + __parainstructions_end[];

    /* Cached VMI operations */
    struct vmi_timer_ops vmi_timer_ops;
    @@ -909,7 +909,7 @@ static inline int __init activate_vmi(vo
    * to do this before IRQs get reenabled. Fortunately, it is
    * idempotent.
    */
    - apply_paravirt(__start_parainstructions, __stop_parainstructions);
    + apply_paravirt(__parainstructions, __parainstructions_end);

    vmi_bringup();

    ===================================================================
    --- a/arch/i386/kernel/vmlinux.lds.S
    +++ b/arch/i386/kernel/vmlinux.lds.S
    @@ -166,9 +166,9 @@ SECTIONS
    }
    . = ALIGN(4);
    .parainstructions : AT(ADDR(.parainstructions) - LOAD_OFFSET) {
    - __start_parainstructions = .;
    + __parainstructions = .;
    *(.parainstructions)
    - __stop_parainstructions = .;
    + __parainstructions_end = .;
    }
    /* .exit.text is discard at runtime, not link time, to deal with references
    from .altinstructions and .eh_frame */
    ===================================================================
    --- a/include/asm-i386/alternative.h
    +++ b/include/asm-i386/alternative.h
    @@ -124,8 +124,8 @@ apply_paravirt(struct paravirt_patch_sit
    apply_paravirt(struct paravirt_patch_site *start,
    struct paravirt_patch_site *end)
    {}
    -#define __start_parainstructions NULL
    -#define __stop_parainstructions NULL
    +#define __parainstructions NULL
    +#define __parainstructions_end NULL
    #endif

    #endif /* _I386_ALTERNATIVE_H */
    --

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-04-14 23:29    [W:0.021 / U:63.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site