lkml.org 
[lkml]   [2007]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 10/26] Xen-paravirt_ops: rename struct paravirt_patch to paravirt_patch_site for clarity
    Rename struct paravirt_patch to paravirt_patch_site, so that it
    clearly refers to a callsite, and not the patch which may be applied
    to that callsite.

    Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
    Cc: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Zachary Amsden <zach@vmware.com>

    ---
    arch/i386/kernel/alternative.c | 8 +++-----
    arch/i386/kernel/vmi.c | 4 ----
    include/asm-i386/alternative.h | 6 +++---
    include/asm-i386/paravirt.h | 5 ++++-
    4 files changed, 10 insertions(+), 13 deletions(-)

    ===================================================================
    --- a/arch/i386/kernel/alternative.c
    +++ b/arch/i386/kernel/alternative.c
    @@ -350,9 +350,9 @@ void alternatives_smp_switch(int smp)
    #endif

    #ifdef CONFIG_PARAVIRT
    -void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end)
    -{
    - struct paravirt_patch *p;
    +void apply_paravirt(struct paravirt_patch_site *start, struct paravirt_patch_site *end)
    +{
    + struct paravirt_patch_site *p;

    for (p = start; p < end; p++) {
    unsigned int used;
    @@ -379,8 +379,6 @@ void apply_paravirt(struct paravirt_patc
    /* Sync to be conservative, in case we patched following instructions */
    sync_core();
    }
    -extern struct paravirt_patch __start_parainstructions[],
    - __stop_parainstructions[];
    #endif /* CONFIG_PARAVIRT */

    void __init alternative_instructions(void)
    ===================================================================
    --- a/arch/i386/kernel/vmi.c
    +++ b/arch/i386/kernel/vmi.c
    @@ -70,10 +70,6 @@ struct {
    void (*set_initial_ap_state)(int, int);
    void (*halt)(void);
    } vmi_ops;
    -
    -/* XXX move this to alternative.h */
    -extern struct paravirt_patch __start_parainstructions[],
    - __stop_parainstructions[];

    /*
    * VMI patching routines.
    ===================================================================
    --- a/include/asm-i386/alternative.h
    +++ b/include/asm-i386/alternative.h
    @@ -118,12 +118,12 @@ static inline void alternatives_smp_swit
    #define LOCK_PREFIX ""
    #endif

    -struct paravirt_patch;
    +struct paravirt_patch_site;
    #ifdef CONFIG_PARAVIRT
    -void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end);
    +void apply_paravirt(struct paravirt_patch_site *start, struct paravirt_patch_site *end);
    #else
    static inline void
    -apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end)
    +apply_paravirt(struct paravirt_patch_site *start, struct paravirt_patch_site *end)
    {}
    #define __start_parainstructions NULL
    #define __stop_parainstructions NULL
    ===================================================================
    --- a/include/asm-i386/paravirt.h
    +++ b/include/asm-i386/paravirt.h
    @@ -501,12 +501,15 @@ void _paravirt_nop(void);
    #define paravirt_nop ((void *)_paravirt_nop)

    /* These all sit in the .parainstructions section to tell us what to patch. */
    -struct paravirt_patch {
    +struct paravirt_patch_site {
    u8 *instr; /* original instructions */
    u8 instrtype; /* type of this instruction */
    u8 len; /* length of original instruction */
    u16 clobbers; /* what registers you may clobber */
    };
    +
    +extern struct paravirt_patch_site __start_parainstructions[],
    + __stop_parainstructions[];

    #define paravirt_alt(insn_string, typenum, clobber) \
    "771:\n\t" insn_string "\n" "772:\n" \
    --

    -
    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-03-02 01:03    [W:3.023 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site