Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[linux-2.6-omap-h63xx.git] / arch / um / include / longjmp.h

diff --git a/arch/um/include/longjmp.h b/arch/um/include/longjmp.h
index 018b3819ab0bf3ea4fc3007a8240b6b7f99c8dca..e860bc5848e0aaff10b382f185aed8b5a4acd81e 100644 (file)
--- a/arch/um/include/longjmp.h
+++ b/arch/um/include/longjmp.h
@@ -1,15 +1,19 @@
 #ifndef __UML_LONGJMP_H
 #define __UML_LONGJMP_H
 
-#include <setjmp.h>
+#include "sysdep/archsetjmp.h"
 #include "os.h"
 
-#define UML_SIGLONGJMP(buf, val) do { \
+extern int setjmp(jmp_buf);
+extern void longjmp(jmp_buf, int);
+
+#define UML_LONGJMP(buf, val) do { \
        longjmp(*buf, val);     \
 } while(0)
 
-#define UML_SIGSETJMP(buf, enable) ({ \
-       int n; \
+#define UML_SETJMP(buf) ({ \
+       int n;     \
+       volatile int enable;    \
        enable = get_signals(); \
        n = setjmp(*buf); \
        if(n != 0) \