The patch titled
uml: allow using again x86/x86_64 crypto code
has been added to the -mm tree. Its filename is
uml-allow-using-again-x86-x86_64-crypto-code.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: uml: allow using again x86/x86_64 crypto code
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
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@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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 deletion(-)
diff -puN arch/um/Makefile-x86_64~uml-allow-using-again-x86-x86_64-crypto-code arch/um/Makefile-x86_64
--- a/arch/um/Makefile-x86_64~uml-allow-using-again-x86-x86_64-crypto-code
+++ a/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 -puN arch/um/include/common-offsets.h~uml-allow-using-again-x86-x86_64-crypto-code arch/um/include/common-offsets.h
--- a/arch/um/include/common-offsets.h~uml-allow-using-again-x86-x86_64-crypto-code
+++ a/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 -puN arch/um/include/sysdep-i386/kernel-offsets.h~uml-allow-using-again-x86-x86_64-crypto-code arch/um/include/sysdep-i386/kernel-offsets.h
--- a/arch/um/include/sysdep-i386/kernel-offsets.h~uml-allow-using-again-x86-x86_64-crypto-code
+++ a/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 -puN arch/um/include/sysdep-x86_64/kernel-offsets.h~uml-allow-using-again-x86-x86_64-crypto-code arch/um/include/sysdep-x86_64/kernel-offsets.h
--- a/arch/um/include/sysdep-x86_64/kernel-offsets.h~uml-allow-using-again-x86-x86_64-crypto-code
+++ a/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>
_
Patches currently in -mm which might be from blaisorblade@xxxxxxxx are
uml-fix-compilation-options-for-user_objs.patch
uml-revert-wrong-patch.patch
uml-correct-removal-of-pte_mkexec.patch
uml-readd-forgot-prototype.patch
uml-make-tt-mode-compile-after-setjmp-related-changes.patch
uml-make-uml_setjmp-always-safe.patch
uml-fix-processor-selection-to-exclude-unsupported-processors-and-features.patch
uml-fix-uname-under-setarch-i386.patch
uml-declare-in-kconfig-our-partial-lockdep-support.patch
uml-allow-using-again-x86-x86_64-crypto-code.patch
uml-asm-offsets-duplication-removal.patch
uml-remove-duplicate-export.patch
uml-deprecate-config_mode_tt.patch
uml-allow-finer-tuning-for-host-vmsplit-setting.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
