Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2465b858 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: allow using again x86/x86_64 crypto code 



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 6c2bb98b).

Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 711553ef

arch/um/Makefile-x86_64

+1 −1
Original line number Diff line number Diff line 
# 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

arch/um/include/common-offsets.h

+1 −0
Original line number Diff line number Diff line
@@ -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));

arch/um/include/sysdep-i386/kernel-offsets.h

+1 −0
Original line number Diff line number Diff line 
#include <linux/stddef.h>

#include <linux/sched.h>

#include <linux/elf.h>

#include <linux/crypto.h>

#include <asm/mman.h>



#define DEFINE(sym, val) \

arch/um/include/sysdep-x86_64/kernel-offsets.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/sched.h>

#include <linux/time.h>

#include <linux/elf.h>

#include <linux/crypto.h>

#include <asm/page.h>

#include <asm/mman.h>