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/sys-i386 | |
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/sys-i386')
-rw-r--r-- | arch/um/sys-i386/Makefile | 6 | ||||
-rw-r--r-- | arch/um/sys-i386/sigcontext.c | 71 |
2 files changed, 3 insertions, 74 deletions
diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile index 9468cf364843..964dc1a04c37 100644 --- a/arch/um/sys-i386/Makefile +++ b/arch/um/sys-i386/Makefile | |||
@@ -3,14 +3,14 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \ | 5 | obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \ |
6 | ptrace_user.o setjmp.o signal.o sigcontext.o stub.o stub_segv.o \ | 6 | ptrace_user.o setjmp.o signal.o stub.o stub_segv.o syscalls.o sysrq.o \ |
7 | syscalls.o sysrq.o sys_call_table.o tls.o | 7 | sys_call_table.o tls.o |
8 | 8 | ||
9 | subarch-obj-y = lib/bitops_32.o lib/semaphore_32.o lib/string_32.o | 9 | subarch-obj-y = lib/bitops_32.o lib/semaphore_32.o lib/string_32.o |
10 | subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o | 10 | subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o |
11 | subarch-obj-$(CONFIG_MODULES) += kernel/module_32.o | 11 | subarch-obj-$(CONFIG_MODULES) += kernel/module_32.o |
12 | 12 | ||
13 | USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o | 13 | USER_OBJS := bugs.o ptrace_user.o fault.o |
14 | 14 | ||
15 | USER_OBJS += user-offsets.s | 15 | USER_OBJS += user-offsets.s |
16 | extra-y += user-offsets.s | 16 | extra-y += user-offsets.s |
diff --git a/arch/um/sys-i386/sigcontext.c b/arch/um/sys-i386/sigcontext.c deleted file mode 100644 index 467d489c31cd..000000000000 --- a/arch/um/sys-i386/sigcontext.c +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #include <stddef.h> | ||
7 | #include <string.h> | ||
8 | #include <asm/ptrace.h> | ||
9 | #include <asm/sigcontext.h> | ||
10 | #include "sysdep/ptrace.h" | ||
11 | #include "kern_util.h" | ||
12 | |||
13 | void sc_to_sc(void *to_ptr, void *from_ptr) | ||
14 | { | ||
15 | struct sigcontext *to = to_ptr, *from = from_ptr; | ||
16 | |||
17 | memcpy(to, from, sizeof(*to) + sizeof(struct _fpstate)); | ||
18 | if(from->fpstate != NULL) | ||
19 | to->fpstate = (struct _fpstate *) (to + 1); | ||
20 | } | ||
21 | |||
22 | unsigned long *sc_sigmask(void *sc_ptr) | ||
23 | { | ||
24 | struct sigcontext *sc = sc_ptr; | ||
25 | return &sc->oldmask; | ||
26 | } | ||
27 | |||
28 | int sc_get_fpregs(unsigned long buf, void *sc_ptr) | ||
29 | { | ||
30 | struct sigcontext *sc = sc_ptr; | ||
31 | struct _fpstate *from = sc->fpstate, *to = (struct _fpstate *) buf; | ||
32 | int err = 0; | ||
33 | |||
34 | if(from == NULL){ | ||
35 | err |= clear_user_proc(&to->cw, sizeof(to->cw)); | ||
36 | err |= clear_user_proc(&to->sw, sizeof(to->sw)); | ||
37 | err |= clear_user_proc(&to->tag, sizeof(to->tag)); | ||
38 | err |= clear_user_proc(&to->ipoff, sizeof(to->ipoff)); | ||
39 | err |= clear_user_proc(&to->cssel, sizeof(to->cssel)); | ||
40 | err |= clear_user_proc(&to->dataoff, sizeof(to->dataoff)); | ||
41 | err |= clear_user_proc(&to->datasel, sizeof(to->datasel)); | ||
42 | err |= clear_user_proc(&to->_st, sizeof(to->_st)); | ||
43 | } | ||
44 | else { | ||
45 | err |= copy_to_user_proc(&to->cw, &from->cw, sizeof(to->cw)); | ||
46 | err |= copy_to_user_proc(&to->sw, &from->sw, sizeof(to->sw)); | ||
47 | err |= copy_to_user_proc(&to->tag, &from->tag, | ||
48 | sizeof(to->tag)); | ||
49 | err |= copy_to_user_proc(&to->ipoff, &from->ipoff, | ||
50 | sizeof(to->ipoff)); | ||
51 | err |= copy_to_user_proc(&to->cssel,& from->cssel, | ||
52 | sizeof(to->cssel)); | ||
53 | err |= copy_to_user_proc(&to->dataoff, &from->dataoff, | ||
54 | sizeof(to->dataoff)); | ||
55 | err |= copy_to_user_proc(&to->datasel, &from->datasel, | ||
56 | sizeof(to->datasel)); | ||
57 | err |= copy_to_user_proc(to->_st, from->_st, sizeof(to->_st)); | ||
58 | } | ||
59 | return(err); | ||
60 | } | ||
61 | |||
62 | /* | ||
63 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
64 | * Emacs will notice this stuff at the end of the file and automatically | ||
65 | * adjust the settings for this buffer only. This must remain at the end | ||
66 | * of the file. | ||
67 | * --------------------------------------------------------------------------- | ||
68 | * Local variables: | ||
69 | * c-file-style: "linux" | ||
70 | * End: | ||
71 | */ | ||