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

[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
# Copyright 2003 - 2004 Pathscale, Inc # Copyright 2003 - 2004 Pathscale, Inc
# Released under the GPL # Released under the GPL
core-y += arch/um/sys-x86_64/ core-y += arch/um/sys-x86_64/ arch/x86_64/crypto/
START := 0x60000000 START := 0x60000000
_extra_flags_ = -fno-builtin -m64 _extra_flags_ = -fno-builtin -m64
......
...@@ -15,3 +15,4 @@ DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG); ...@@ -15,3 +15,4 @@ DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG);
DEFINE(UM_ELF_CLASS, ELF_CLASS); DEFINE(UM_ELF_CLASS, ELF_CLASS);
DEFINE(UM_ELFCLASS32, ELFCLASS32); DEFINE(UM_ELFCLASS32, ELFCLASS32);
DEFINE(UM_ELFCLASS64, ELFCLASS64); DEFINE(UM_ELFCLASS64, ELFCLASS64);
DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/crypto.h>
#include <asm/mman.h> #include <asm/mman.h>
#define DEFINE(sym, val) \ #define DEFINE(sym, val) \
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/crypto.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/mman.h> #include <asm/mman.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment