lkml.org 
[lkml]   [2006]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/14] uml: asm offsets duplication removal
    Date
    From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

    Unify macros common to x86 and x86_64 kernel-offsets.h files.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    ---

    arch/um/include/common-offsets.h | 10 ++++++++++
    arch/um/include/sysdep-i386/kernel-offsets.h | 4 ----
    arch/um/include/sysdep-x86_64/kernel-offsets.h | 4 ----
    3 files changed, 10 insertions(+), 8 deletions(-)

    diff --git a/arch/um/include/common-offsets.h b/arch/um/include/common-offsets.h
    index 39bb210..461175f 100644
    --- a/arch/um/include/common-offsets.h
    +++ b/arch/um/include/common-offsets.h
    @@ -1,9 +1,16 @@
    /* for use by sys-$SUBARCH/kernel-offsets.c */

    +DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);
    +#ifdef CONFIG_MODE_TT
    +OFFSET(HOST_TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);
    +#endif
    +
    OFFSET(HOST_TASK_REGS, task_struct, thread.regs);
    OFFSET(HOST_TASK_PID, task_struct, pid);
    +
    DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE);
    DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);
    +
    DEFINE_STR(UM_KERN_EMERG, KERN_EMERG);
    DEFINE_STR(UM_KERN_ALERT, KERN_ALERT);
    DEFINE_STR(UM_KERN_CRIT, KERN_CRIT);
    @@ -12,7 +19,10 @@ DEFINE_STR(UM_KERN_WARNING, KERN_WARNING
    DEFINE_STR(UM_KERN_NOTICE, KERN_NOTICE);
    DEFINE_STR(UM_KERN_INFO, KERN_INFO);
    DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG);
    +
    DEFINE(UM_ELF_CLASS, ELF_CLASS);
    DEFINE(UM_ELFCLASS32, ELFCLASS32);
    DEFINE(UM_ELFCLASS64, ELFCLASS64);
    +
    +/* For crypto assembler code. */
    DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
    diff --git a/arch/um/include/sysdep-i386/kernel-offsets.h b/arch/um/include/sysdep-i386/kernel-offsets.h
    index 2e58c4c..97ec9d8 100644
    --- a/arch/um/include/sysdep-i386/kernel-offsets.h
    +++ b/arch/um/include/sysdep-i386/kernel-offsets.h
    @@ -18,9 +18,5 @@ #define OFFSET(sym, str, mem) \
    void foo(void)
    {
    OFFSET(HOST_TASK_DEBUGREGS, task_struct, thread.arch.debugregs);
    - DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);
    -#ifdef CONFIG_MODE_TT
    - OFFSET(HOST_TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);
    -#endif
    #include <common-offsets.h>
    }
    diff --git a/arch/um/include/sysdep-x86_64/kernel-offsets.h b/arch/um/include/sysdep-x86_64/kernel-offsets.h
    index 4cbfbb9..a307237 100644
    --- a/arch/um/include/sysdep-x86_64/kernel-offsets.h
    +++ b/arch/um/include/sysdep-x86_64/kernel-offsets.h
    @@ -19,9 +19,5 @@ #define OFFSET(sym, str, mem) \

    void foo(void)
    {
    - DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);
    -#ifdef CONFIG_MODE_TT
    - OFFSET(HOST_TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);
    -#endif
    #include <common-offsets.h>
    }
    Chiacchiera con i tuoi amici in tempo reale!
    http://it.yahoo.com/mail_it/foot/*http://it.messenger.yahoo.com
    -
    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: 2006-10-05 23:47    [W:0.038 / U:1.204 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site