lkml.org 
[lkml]   [2009]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/11] x86: stackprotector.h misc update
    Date
    Impact: misc udpate

    * wrap content with CONFIG_CC_STACK_PROTECTOR so that other arch files
    can include it directly

    * add missing includes

    This will help future changes.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    ---
    arch/x86/include/asm/stackprotector.h | 7 ++++++-
    1 files changed, 6 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
    index 36a700a..ee275e9 100644
    --- a/arch/x86/include/asm/stackprotector.h
    +++ b/arch/x86/include/asm/stackprotector.h
    @@ -1,8 +1,12 @@
    #ifndef _ASM_STACKPROTECTOR_H
    #define _ASM_STACKPROTECTOR_H 1

    +#ifdef CONFIG_CC_STACKPROTECTOR
    +
    #include <asm/tsc.h>
    #include <asm/processor.h>
    +#include <asm/percpu.h>
    +#include <linux/random.h>

    /*
    * Initialize the stackprotector canary value.
    @@ -35,4 +39,5 @@ static __always_inline void boot_init_stack_canary(void)
    percpu_write(irq_stack_union.stack_canary, canary);
    }

    -#endif
    +#endif /* CC_STACKPROTECTOR */
    +#endif /* _ASM_STACKPROTECTOR_H */
    --
    1.6.0.2


    \
     
     \ /
      Last update: 2009-02-09 14:45    [W:0.020 / U:60.420 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site