The patch titled
uml: asm offsets duplication removal
has been added to the -mm tree. Its filename is
uml-asm-offsets-duplication-removal.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: asm offsets duplication removal
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Unify macros common to x86 and x86_64 kernel-offsets.h files.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/include/common-offsets.h | 10 ++++++++++
arch/um/include/sysdep-i386/kernel-offsets.h | 4 ----
arch/um/include/sysdep-x86_64/kernel-offsets.h | 4 ----
3 files changed, 10 insertions(+), 8 deletions(-)
diff -puN arch/um/include/common-offsets.h~uml-asm-offsets-duplication-removal arch/um/include/common-offsets.h
--- a/arch/um/include/common-offsets.h~uml-asm-offsets-duplication-removal
+++ a/arch/um/include/common-offsets.h
@@ -1,9 +1,16 @@
/* for use by sys-$SUBARCH/kernel-offsets.c */
+DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);
+#ifdef CONFIG_MODE_TT
+OFFSET(HOST_TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);
+#endif
+
OFFSET(HOST_TASK_REGS, task_struct, thread.regs);
OFFSET(HOST_TASK_PID, task_struct, pid);
+
DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE);
DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);
+
DEFINE_STR(UM_KERN_EMERG, KERN_EMERG);
DEFINE_STR(UM_KERN_ALERT, KERN_ALERT);
DEFINE_STR(UM_KERN_CRIT, KERN_CRIT);
@@ -12,7 +19,10 @@ DEFINE_STR(UM_KERN_WARNING, KERN_WARNING
DEFINE_STR(UM_KERN_NOTICE, KERN_NOTICE);
DEFINE_STR(UM_KERN_INFO, KERN_INFO);
DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG);
+
DEFINE(UM_ELF_CLASS, ELF_CLASS);
DEFINE(UM_ELFCLASS32, ELFCLASS32);
DEFINE(UM_ELFCLASS64, ELFCLASS64);
+
+/* For crypto assembler code. */
DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
diff -puN arch/um/include/sysdep-i386/kernel-offsets.h~uml-asm-offsets-duplication-removal arch/um/include/sysdep-i386/kernel-offsets.h
--- a/arch/um/include/sysdep-i386/kernel-offsets.h~uml-asm-offsets-duplication-removal
+++ a/arch/um/include/sysdep-i386/kernel-offsets.h
@@ -18,9 +18,5 @@
void foo(void)
{
OFFSET(HOST_TASK_DEBUGREGS, task_struct, thread.arch.debugregs);
- DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);
-#ifdef CONFIG_MODE_TT
- OFFSET(HOST_TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);
-#endif
#include <common-offsets.h>
}
diff -puN arch/um/include/sysdep-x86_64/kernel-offsets.h~uml-asm-offsets-duplication-removal arch/um/include/sysdep-x86_64/kernel-offsets.h
--- a/arch/um/include/sysdep-x86_64/kernel-offsets.h~uml-asm-offsets-duplication-removal
+++ a/arch/um/include/sysdep-x86_64/kernel-offsets.h
@@ -19,9 +19,5 @@
void foo(void)
{
- DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);
-#ifdef CONFIG_MODE_TT
- OFFSET(HOST_TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);
-#endif
#include <common-offsets.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
