diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:27:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:07 -0400 |
commit | f0c4cad99c12f08cb2a6cd0255911b2a93c57707 (patch) | |
tree | 1687ef2577bc7429955e8642fe8340ff2292817c /arch/um/include | |
parent | 54fa0ba40698af6d6735ade024293bb51cc4d4b3 (diff) |
uml: style fixes in FP code
Tidy the code affected by the floating point fixes.
A bunch of unused stuff is gone, including two sigcontext.c files,
which turned out to be entirely unneeded.
There are the usual fixes -
whitespace and style cleanups
copyright updates
emacs formatting comments gone
include cleanups
adding severities to printks
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/include')
-rw-r--r-- | arch/um/include/sysdep-i386/sigcontext.h | 13 | ||||
-rw-r--r-- | arch/um/include/sysdep-x86_64/sigcontext.h | 28 |
2 files changed, 1 insertions, 40 deletions
diff --git a/arch/um/include/sysdep-i386/sigcontext.h b/arch/um/include/sysdep-i386/sigcontext.h index 3050a6aaed7a..67e77122aa45 100644 --- a/arch/um/include/sysdep-i386/sigcontext.h +++ b/arch/um/include/sysdep-i386/sigcontext.h | |||
@@ -6,15 +6,10 @@ | |||
6 | #ifndef __SYS_SIGCONTEXT_I386_H | 6 | #ifndef __SYS_SIGCONTEXT_I386_H |
7 | #define __SYS_SIGCONTEXT_I386_H | 7 | #define __SYS_SIGCONTEXT_I386_H |
8 | 8 | ||
9 | #include "uml-config.h" | ||
10 | #include "skas.h" | ||
11 | #include "sysdep/sc.h" | 9 | #include "sysdep/sc.h" |
12 | 10 | ||
13 | #define IP_RESTART_SYSCALL(ip) ((ip) -= 2) | 11 | #define IP_RESTART_SYSCALL(ip) ((ip) -= 2) |
14 | 12 | ||
15 | #define SC_RESTART_SYSCALL(sc) IP_RESTART_SYSCALL(SC_IP(sc)) | ||
16 | #define SC_SET_SYSCALL_RETURN(sc, result) SC_EAX(sc) = (result) | ||
17 | |||
18 | #define GET_FAULTINFO_FROM_SC(fi,sc) \ | 13 | #define GET_FAULTINFO_FROM_SC(fi,sc) \ |
19 | { \ | 14 | { \ |
20 | (fi).cr2 = SC_CR2(sc); \ | 15 | (fi).cr2 = SC_CR2(sc); \ |
@@ -22,18 +17,10 @@ | |||
22 | (fi).trap_no = SC_TRAPNO(sc); \ | 17 | (fi).trap_no = SC_TRAPNO(sc); \ |
23 | } | 18 | } |
24 | 19 | ||
25 | /* ptrace expects that, at the start of a system call, %eax contains | ||
26 | * -ENOSYS, so this makes it so. | ||
27 | */ | ||
28 | #define SC_START_SYSCALL(sc) do SC_EAX(sc) = -ENOSYS; while(0) | ||
29 | |||
30 | /* This is Page Fault */ | 20 | /* This is Page Fault */ |
31 | #define SEGV_IS_FIXABLE(fi) ((fi)->trap_no == 14) | 21 | #define SEGV_IS_FIXABLE(fi) ((fi)->trap_no == 14) |
32 | 22 | ||
33 | /* SKAS3 has no trap_no on i386, but get_skas_faultinfo() sets it to 0. */ | 23 | /* SKAS3 has no trap_no on i386, but get_skas_faultinfo() sets it to 0. */ |
34 | #define SEGV_MAYBE_FIXABLE(fi) ((fi)->trap_no == 0 && ptrace_faultinfo) | 24 | #define SEGV_MAYBE_FIXABLE(fi) ((fi)->trap_no == 0 && ptrace_faultinfo) |
35 | 25 | ||
36 | extern unsigned long *sc_sigmask(void *sc_ptr); | ||
37 | extern int sc_get_fpregs(unsigned long buf, void *sc_ptr); | ||
38 | |||
39 | #endif | 26 | #endif |
diff --git a/arch/um/include/sysdep-x86_64/sigcontext.h b/arch/um/include/sysdep-x86_64/sigcontext.h index 41073235e7ad..0155133b1458 100644 --- a/arch/um/include/sysdep-x86_64/sigcontext.h +++ b/arch/um/include/sysdep-x86_64/sigcontext.h | |||
@@ -11,43 +11,17 @@ | |||
11 | 11 | ||
12 | #define IP_RESTART_SYSCALL(ip) ((ip) -= 2) | 12 | #define IP_RESTART_SYSCALL(ip) ((ip) -= 2) |
13 | 13 | ||
14 | #define SC_RESTART_SYSCALL(sc) IP_RESTART_SYSCALL(SC_IP(sc)) | 14 | #define GET_FAULTINFO_FROM_SC(fi, sc) \ |
15 | #define SC_SET_SYSCALL_RETURN(sc, result) SC_RAX(sc) = (result) | ||
16 | |||
17 | #define SC_FAULT_ADDR(sc) SC_CR2(sc) | ||
18 | #define SC_FAULT_TYPE(sc) SC_ERR(sc) | ||
19 | |||
20 | #define GET_FAULTINFO_FROM_SC(fi,sc) \ | ||
21 | { \ | 15 | { \ |
22 | (fi).cr2 = SC_CR2(sc); \ | 16 | (fi).cr2 = SC_CR2(sc); \ |
23 | (fi).error_code = SC_ERR(sc); \ | 17 | (fi).error_code = SC_ERR(sc); \ |
24 | (fi).trap_no = SC_TRAPNO(sc); \ | 18 | (fi).trap_no = SC_TRAPNO(sc); \ |
25 | } | 19 | } |
26 | 20 | ||
27 | /* ptrace expects that, at the start of a system call, %eax contains | ||
28 | * -ENOSYS, so this makes it so. | ||
29 | */ | ||
30 | |||
31 | #define SC_START_SYSCALL(sc) do SC_RAX(sc) = -ENOSYS; while(0) | ||
32 | |||
33 | /* This is Page Fault */ | 21 | /* This is Page Fault */ |
34 | #define SEGV_IS_FIXABLE(fi) ((fi)->trap_no == 14) | 22 | #define SEGV_IS_FIXABLE(fi) ((fi)->trap_no == 14) |
35 | 23 | ||
36 | /* No broken SKAS API, which doesn't pass trap_no, here. */ | 24 | /* No broken SKAS API, which doesn't pass trap_no, here. */ |
37 | #define SEGV_MAYBE_FIXABLE(fi) 0 | 25 | #define SEGV_MAYBE_FIXABLE(fi) 0 |
38 | 26 | ||
39 | extern unsigned long *sc_sigmask(void *sc_ptr); | ||
40 | |||
41 | #endif | 27 | #endif |
42 | |||
43 | /* | ||
44 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
45 | * Emacs will notice this stuff at the end of the file and automatically | ||
46 | * adjust the settings for this buffer only. This must remain at the end | ||
47 | * of the file. | ||
48 | * --------------------------------------------------------------------------- | ||
49 | * Local variables: | ||
50 | * c-file-style: "linux" | ||
51 | * End: | ||
52 | */ | ||
53 | |||