lkml.org 
[lkml]   [2009]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/13] m32r: Define THREAD_SIZE only once.
    Date
    Previously, m32r's asm/thread_info.h defined THREAD_SIZE differently
    for assembly and C code; now that PAGE_SIZE is usable from assembly,
    these can be combined. Also, m32r's asm/processor.h redefines
    THREAD_SIZE to the same value; remove this redundant definition.

    Signed-off-by: Tim Abbott <tabbott@ksplice.com>
    Cc: Hirokazu Takata <takata@linux-m32r.org>
    Acked-by: Sam Ravnborg <sam@ravnborg.org>
    ---
    arch/m32r/include/asm/processor.h | 2 --
    arch/m32r/include/asm/thread_info.h | 6 ++----
    2 files changed, 2 insertions(+), 6 deletions(-)

    diff --git a/arch/m32r/include/asm/processor.h b/arch/m32r/include/asm/processor.h
    index 1a997fc..8397c24 100644
    --- a/arch/m32r/include/asm/processor.h
    +++ b/arch/m32r/include/asm/processor.h
    @@ -140,8 +140,6 @@ unsigned long get_wchan(struct task_struct *p);
    #define KSTK_EIP(tsk) ((tsk)->thread.lr)
    #define KSTK_ESP(tsk) ((tsk)->thread.sp)

    -#define THREAD_SIZE (2*PAGE_SIZE)
    -
    #define cpu_relax() barrier()

    #endif /* _ASM_M32R_PROCESSOR_H */
    diff --git a/arch/m32r/include/asm/thread_info.h b/arch/m32r/include/asm/thread_info.h
    index 7157815..4d66169 100644
    --- a/arch/m32r/include/asm/thread_info.h
    +++ b/arch/m32r/include/asm/thread_info.h
    @@ -55,6 +55,8 @@ struct thread_info {

    #define PREEMPT_ACTIVE 0x10000000

    +#define THREAD_SIZE (PAGE_SIZE << 1)
    +
    /*
    * macros/functions for gaining access to the thread information structure
    */
    @@ -76,8 +78,6 @@ struct thread_info {
    #define init_thread_info (init_thread_union.thread_info)
    #define init_stack (init_thread_union.stack)

    -#define THREAD_SIZE (2*PAGE_SIZE)
    -
    /* how to get the thread information struct from C */
    static inline struct thread_info *current_thread_info(void)
    {
    @@ -127,8 +127,6 @@ static inline unsigned int get_thread_fault_code(void)

    #else /* !__ASSEMBLY__ */

    -#define THREAD_SIZE 8192
    -
    /* how to get the thread information struct from ASM */
    #define GET_THREAD_INFO(reg) GET_THREAD_INFO reg
    .macro GET_THREAD_INFO reg
    --
    1.6.3.3


    \
     
     \ /
      Last update: 2009-09-22 16:27    [W:0.030 / U:60.092 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site