diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2006-10-11 04:21:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 14:14:20 -0400 |
commit | b5cdb5797d364a112879e49cc708083853ffc592 (patch) | |
tree | fa87aa6b3a0511ffe7f7c76f52e3e0d037833bb0 /arch | |
parent | d875f9fd3f2369bf6f4d0e9989f00fe610eac470 (diff) |
[PATCH] uml: make UML_SETJMP always safe
If enable is moved by GCC in a register its value may not be preserved after
coming back there with longjmp(). So, mark it as volatile to prevent this;
this is suggested (it seems) in info gcc, when it talks about -Wuninitialized.
I re-read this and it seems to say something different, but I still believe
this may be needed.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/um/include/longjmp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/include/longjmp.h b/arch/um/include/longjmp.h index e93c6d3e893b..e860bc5848e0 100644 --- a/arch/um/include/longjmp.h +++ b/arch/um/include/longjmp.h | |||
@@ -12,7 +12,8 @@ extern void longjmp(jmp_buf, int); | |||
12 | } while(0) | 12 | } while(0) |
13 | 13 | ||
14 | #define UML_SETJMP(buf) ({ \ | 14 | #define UML_SETJMP(buf) ({ \ |
15 | int n, enable; \ | 15 | int n; \ |
16 | volatile int enable; \ | ||
16 | enable = get_signals(); \ | 17 | enable = get_signals(); \ |
17 | n = setjmp(*buf); \ | 18 | n = setjmp(*buf); \ |
18 | if(n != 0) \ | 19 | if(n != 0) \ |