Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d875f9fd authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: make TT mode compile after setjmp-related changes 



Make TT mode compile after the introduction of klibc's implementation of
setjmp.

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 e27e80b3

arch/um/kernel/tt/uaccess_user.c

+3 −3
Original line number Diff line number Diff line
@@ -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, unsigned long n, 
	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;

arch/um/os-Linux/tt.c

+0 −1
Original line number Diff line number Diff line
@@ -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>