diff options
author | Jeff Dike <jdike@addtoit.com> | 2008-02-05 01:31:04 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:29 -0500 |
commit | bf8fde785b872282e7e86d9ea8a9c4e543985bb3 (patch) | |
tree | cb813edfbb04c8474caab0f8a26a8512a503cf82 /arch/um/kernel/irq.c | |
parent | 7b5cc6ee6cf9001775c348bac09814a45f1276b7 (diff) |
uml: miscellaneous code cleanups
Code tidying -
the pid field of struct irq_fd isn't used, so it is removed
os_set_fd_async needed to read flags before changing them, it
doesn't need a pid passed in because it can call getpid itself, and a
block of unused code needed deleting
os_get_exec_close was unused, so it is removed
ptrace_child called _exit for historical reasons which are no
longer valid, so just calls exit instead
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/kernel/irq.c')
-rw-r--r-- | arch/um/kernel/irq.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index ba11ccd6a8a3..91587f8db340 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
@@ -107,10 +107,9 @@ int activate_fd(int irq, int fd, int type, void *dev_id) | |||
107 | struct pollfd *tmp_pfd; | 107 | struct pollfd *tmp_pfd; |
108 | struct irq_fd *new_fd, *irq_fd; | 108 | struct irq_fd *new_fd, *irq_fd; |
109 | unsigned long flags; | 109 | unsigned long flags; |
110 | int pid, events, err, n; | 110 | int events, err, n; |
111 | 111 | ||
112 | pid = os_getpid(); | 112 | err = os_set_fd_async(fd); |
113 | err = os_set_fd_async(fd, pid); | ||
114 | if (err < 0) | 113 | if (err < 0) |
115 | goto out; | 114 | goto out; |
116 | 115 | ||
@@ -127,7 +126,6 @@ int activate_fd(int irq, int fd, int type, void *dev_id) | |||
127 | .fd = fd, | 126 | .fd = fd, |
128 | .type = type, | 127 | .type = type, |
129 | .irq = irq, | 128 | .irq = irq, |
130 | .pid = pid, | ||
131 | .events = events, | 129 | .events = events, |
132 | .current_events = 0 } ); | 130 | .current_events = 0 } ); |
133 | 131 | ||