diff options
| author | Jeff Dike <jdike@addtoit.com> | 2008-02-04 22:31:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 09:44:29 -0800 |
| commit | bf8fde785b872282e7e86d9ea8a9c4e543985bb3 (patch) | |
| tree | cb813edfbb04c8474caab0f8a26a8512a503cf82 /arch/um/include | |
| 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/include')
| -rw-r--r-- | arch/um/include/irq_user.h | 1 | ||||
| -rw-r--r-- | arch/um/include/os.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/um/include/irq_user.h b/arch/um/include/irq_user.h index 884a9c17eea0..e60b31873de1 100644 --- a/arch/um/include/irq_user.h +++ b/arch/um/include/irq_user.h @@ -14,7 +14,6 @@ struct irq_fd { int fd; int type; int irq; - int pid; int events; int current_events; }; diff --git a/arch/um/include/os.h b/arch/um/include/os.h index 9428d34792ca..fdac1a55d031 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h @@ -127,7 +127,6 @@ static inline struct openflags of_cloexec(struct openflags flags) extern int os_stat_file(const char *file_name, struct uml_stat *buf); extern int os_stat_fd(const int fd, struct uml_stat *buf); extern int os_access(const char *file, int mode); -extern int os_get_exec_close(int fd, int *close_on_exec); extern int os_set_exec_close(int fd); extern int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg); extern int os_get_ifname(int fd, char *namebuf); @@ -142,7 +141,7 @@ extern int os_write_file(int fd, const void *buf, int count); extern int os_file_size(const char *file, unsigned long long *size_out); extern int os_file_modtime(const char *file, unsigned long *modtime); extern int os_pipe(int *fd, int stream, int close_on_exec); -extern int os_set_fd_async(int fd, int owner); +extern int os_set_fd_async(int fd); extern int os_clear_fd_async(int fd); extern int os_set_fd_block(int fd, int blocking); extern int os_accept_connection(int fd); |