Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[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..8e7053013f7b7d11d218603487abf8c9dcd96294 100644 (file)
--- a/arch/um/include/longjmp.h
+++ b/arch/um/include/longjmp.h
@@ -4,11 +4,11 @@
 #include <setjmp.h>
 #include "os.h"
 
-#define UML_SIGLONGJMP(buf, val) do { \
+#define UML_LONGJMP(buf, val) do { \
        longjmp(*buf, val);     \
 } while(0)
 
-#define UML_SIGSETJMP(buf, enable) ({ \
+#define UML_SETJMP(buf, enable) ({ \
        int n; \
        enable = get_signals(); \
        n = setjmp(*buf); \