lkml.org 
[lkml]   [2010]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[115/127] x86-32: Fix dummy trampoline-related inline stubs
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: H. Peter Anvin <hpa@zytor.com>

    commit 8848a91068c018bc91f597038a0f41462a0f88a4 upstream.

    Fix dummy inline stubs for trampoline-related functions when no
    trampolines exist (until we get rid of the no-trampoline case
    entirely.)

    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Cc: Joerg Roedel <joerg.roedel@amd.com>
    Cc: Borislav Petkov <borislav.petkov@amd.com>
    LKML-Reference: <4C6C294D.3030404@zytor.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/x86/include/asm/trampoline.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/x86/include/asm/trampoline.h
    +++ b/arch/x86/include/asm/trampoline.h
    @@ -23,8 +23,8 @@ extern unsigned long setup_trampoline(vo
    extern void __init setup_trampoline_page_table(void);
    extern void __init reserve_trampoline_memory(void);
    #else
    -static inline void reserve_trampoline_memory(void) {};
    -extern void __init setup_trampoline_page_table(void) {};
    +static inline void setup_trampoline_page_table(void) {}
    +static inline void reserve_trampoline_memory(void) {}
    #endif /* CONFIG_X86_TRAMPOLINE */

    #endif /* __ASSEMBLY__ */



    \
     
     \ /
      Last update: 2010-12-08 02:11    [W:0.020 / U:119.180 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site