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 10/14] uml: allow using again x86/x86_64 crypto code
    Date
    From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

    Enable compilation of x86_64 crypto code;, and add the needed constant to make
    the code compile again (that macro was added to i386 asm-offsets between 2.6.17
    and 2.6.18, in 6c2bb98bc33ae33c7a33a133a4cd5a06395fece5).

    Cc: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    ---
    arch/um/Makefile-x86_64 | 2 +-
    arch/um/include/common-offsets.h | 1 +
    arch/um/include/sysdep-i386/kernel-offsets.h | 1 +
    arch/um/include/sysdep-x86_64/kernel-offsets.h | 1 +
    4 files changed, 4 insertions(+), 1 deletions(-)
    diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
    index 87d6373..d278682 100644
    --- a/arch/um/Makefile-x86_64
    +++ b/arch/um/Makefile-x86_64
    @@ -1,7 +1,7 @@
    # Copyright 2003 - 2004 Pathscale, Inc
    # Released under the GPL

    -core-y += arch/um/sys-x86_64/
    +core-y += arch/um/sys-x86_64/ arch/x86_64/crypto/
    START := 0x60000000

    _extra_flags_ = -fno-builtin -m64
    diff --git a/arch/um/include/common-offsets.h b/arch/um/include/common-offsets.h
    index 356390d..39bb210 100644
    --- a/arch/um/include/common-offsets.h
    +++ b/arch/um/include/common-offsets.h
    @@ -15,3 +15,4 @@ DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG);
    DEFINE(UM_ELF_CLASS, ELF_CLASS);
    DEFINE(UM_ELFCLASS32, ELFCLASS32);
    DEFINE(UM_ELFCLASS64, ELFCLASS64);
    +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 2c13de3..2e58c4c 100644
    --- a/arch/um/include/sysdep-i386/kernel-offsets.h
    +++ b/arch/um/include/sysdep-i386/kernel-offsets.h
    @@ -1,6 +1,7 @@
    #include <linux/stddef.h>
    #include <linux/sched.h>
    #include <linux/elf.h>
    +#include <linux/crypto.h>
    #include <asm/mman.h>

    #define DEFINE(sym, val) \
    diff --git a/arch/um/include/sysdep-x86_64/kernel-offsets.h b/arch/um/include/sysdep-x86_64/kernel-offsets.h
    index 91d129f..4cbfbb9 100644
    --- a/arch/um/include/sysdep-x86_64/kernel-offsets.h
    +++ b/arch/um/include/sysdep-x86_64/kernel-offsets.h
    @@ -2,6 +2,7 @@ #include <linux/stddef.h>
    #include <linux/sched.h>
    #include <linux/time.h>
    #include <linux/elf.h>
    +#include <linux/crypto.h>
    #include <asm/page.h>
    #include <asm/mman.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    [from the cache]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean