diff options
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 { | |||
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) | |||
127 | extern int os_stat_file(const char *file_name, struct uml_stat *buf); | 127 | extern int os_stat_file(const char *file_name, struct uml_stat *buf); |
128 | extern int os_stat_fd(const int fd, struct uml_stat *buf); | 128 | extern int os_stat_fd(const int fd, struct uml_stat *buf); |
129 | extern int os_access(const char *file, int mode); | 129 | extern int os_access(const char *file, int mode); |
130 | extern int os_get_exec_close(int fd, int *close_on_exec); | ||
131 | extern int os_set_exec_close(int fd); | 130 | extern int os_set_exec_close(int fd); |
132 | extern int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg); | 131 | extern int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg); |
133 | extern int os_get_ifname(int fd, char *namebuf); | 132 | 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); | |||
142 | extern int os_file_size(const char *file, unsigned long long *size_out); | 141 | extern int os_file_size(const char *file, unsigned long long *size_out); |
143 | extern int os_file_modtime(const char *file, unsigned long *modtime); | 142 | extern int os_file_modtime(const char *file, unsigned long *modtime); |
144 | extern int os_pipe(int *fd, int stream, int close_on_exec); | 143 | extern int os_pipe(int *fd, int stream, int close_on_exec); |
145 | extern int os_set_fd_async(int fd, int owner); | 144 | extern int os_set_fd_async(int fd); |
146 | extern int os_clear_fd_async(int fd); | 145 | extern int os_clear_fd_async(int fd); |
147 | extern int os_set_fd_block(int fd, int blocking); | 146 | extern int os_set_fd_block(int fd, int blocking); |
148 | extern int os_accept_connection(int fd); | 147 | extern int os_accept_connection(int fd); |