aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/include
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2008-02-05 01:31:04 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 12:44:29 -0500
commitbf8fde785b872282e7e86d9ea8a9c4e543985bb3 (patch)
treecb813edfbb04c8474caab0f8a26a8512a503cf82 /arch/um/include
parent7b5cc6ee6cf9001775c348bac09814a45f1276b7 (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.h1
-rw-r--r--arch/um/include/os.h3
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 {
14 int fd; 14 int fd;
15 int type; 15 int type;
16 int irq; 16 int irq;
17 int pid;
18 int events; 17 int events;
19 int current_events; 18 int current_events;
20}; 19};
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)
127extern int os_stat_file(const char *file_name, struct uml_stat *buf); 127extern int os_stat_file(const char *file_name, struct uml_stat *buf);
128extern int os_stat_fd(const int fd, struct uml_stat *buf); 128extern int os_stat_fd(const int fd, struct uml_stat *buf);
129extern int os_access(const char *file, int mode); 129extern int os_access(const char *file, int mode);
130extern int os_get_exec_close(int fd, int *close_on_exec);
131extern int os_set_exec_close(int fd); 130extern int os_set_exec_close(int fd);
132extern int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg); 131extern int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg);
133extern int os_get_ifname(int fd, char *namebuf); 132extern int os_get_ifname(int fd, char *namebuf);
@@ -142,7 +141,7 @@ extern int os_write_file(int fd, const void *buf, int count);
142extern int os_file_size(const char *file, unsigned long long *size_out); 141extern int os_file_size(const char *file, unsigned long long *size_out);
143extern int os_file_modtime(const char *file, unsigned long *modtime); 142extern int os_file_modtime(const char *file, unsigned long *modtime);
144extern int os_pipe(int *fd, int stream, int close_on_exec); 143extern int os_pipe(int *fd, int stream, int close_on_exec);
145extern int os_set_fd_async(int fd, int owner); 144extern int os_set_fd_async(int fd);
146extern int os_clear_fd_async(int fd); 145extern int os_clear_fd_async(int fd);
147extern int os_set_fd_block(int fd, int blocking); 146extern int os_set_fd_block(int fd, int blocking);
148extern int os_accept_connection(int fd); 147extern int os_accept_connection(int fd);