The patch titled
uml: make TT mode compile after setjmp-related changes
has been added to the -mm tree. Its filename is
uml-make-tt-mode-compile-after-setjmp-related-changes.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: make TT mode compile after setjmp-related changes
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Make TT mode compile after the introduction of klibc's implementation of
setjmp.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/kernel/tt/uaccess_user.c | 6 +++---
arch/um/os-Linux/tt.c | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff -puN arch/um/kernel/tt/uaccess_user.c~uml-make-tt-mode-compile-after-setjmp-related-changes arch/um/kernel/tt/uaccess_user.c
--- a/arch/um/kernel/tt/uaccess_user.c~uml-make-tt-mode-compile-after-setjmp-related-changes
+++ a/arch/um/kernel/tt/uaccess_user.c
@@ -4,13 +4,13 @@
* Licensed under the GPL
*/
-#include <setjmp.h>
#include <string.h>
#include "user_util.h"
#include "uml_uaccess.h"
#include "task.h"
#include "kern_util.h"
#include "os.h"
+#include "longjmp.h"
int __do_copy_from_user(void *to, const void *from, int n,
void **fault_addr, void **fault_catcher)
@@ -80,10 +80,10 @@ int __do_strnlen_user(const char *str, u
struct tt_regs save = TASK_REGS(get_current())->tt;
int ret;
unsigned long *faddrp = (unsigned long *)fault_addr;
- sigjmp_buf jbuf;
+ jmp_buf jbuf;
*fault_catcher = &jbuf;
- if(sigsetjmp(jbuf, 1) == 0)
+ if(UML_SETJMP(&jbuf) == 0)
ret = strlen(str) + 1;
else ret = *faddrp - (unsigned long) str;
diff -puN arch/um/os-Linux/tt.c~uml-make-tt-mode-compile-after-setjmp-related-changes arch/um/os-Linux/tt.c
--- a/arch/um/os-Linux/tt.c~uml-make-tt-mode-compile-after-setjmp-related-changes
+++ a/arch/um/os-Linux/tt.c
@@ -10,7 +10,6 @@
#include <errno.h>
#include <stdarg.h>
#include <stdlib.h>
-#include <setjmp.h>
#include <sys/time.h>
#include <sys/ptrace.h>
#include <linux/ptrace.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
