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

[Paolo 'B. G. <bla...@ya...>]

From: Paolo 'Blaisorblade' Giarrusso <bla...@ya...>

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

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...>
Index: linux-2.6.git/arch/um/Makefile-x86_64
===================================================================
--- linux-2.6.git.orig/arch/um/Makefile-x86_64
+++ linux-2.6.git/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
 
 #We #undef __x86_64__ for kernelspace, not for userspace where
Index: linux-2.6.git/arch/um/include/common-offsets.h
===================================================================
--- linux-2.6.git.orig/arch/um/include/common-offsets.h
+++ linux-2.6.git/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));
Index: linux-2.6.git/arch/um/include/sysdep-i386/kernel-offsets.h
===================================================================
--- linux-2.6.git.orig/arch/um/include/sysdep-i386/kernel-offsets.h
+++ linux-2.6.git/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) \
Index: linux-2.6.git/arch/um/include/sysdep-x86_64/kernel-offsets.h
===================================================================
--- linux-2.6.git.orig/arch/um/include/sysdep-x86_64/kernel-offsets.h
+++ linux-2.6.git/arch/um/include/sysdep-x86_64/kernel-offsets.h
@@ -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>