提交 29ac1c21 编写于 作者: J Jeff Dike 提交者: Linus Torvalds

[PATCH] uml: make some symbols static

A few sigio-related things can be made static.
Signed-off-by: NJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 61232f2f
...@@ -329,7 +329,6 @@ extern void os_set_ioignore(void); ...@@ -329,7 +329,6 @@ extern void os_set_ioignore(void);
extern void init_irq_signals(int on_sigstack); extern void init_irq_signals(int on_sigstack);
/* sigio.c */ /* sigio.c */
extern int add_sigio_fd(int fd, int read);
extern int ignore_sigio_fd(int fd); extern int ignore_sigio_fd(int fd);
extern void maybe_sigio_broken(int fd, int read); extern void maybe_sigio_broken(int fd, int read);
......
...@@ -53,17 +53,3 @@ void sigio_unlock(void) ...@@ -53,17 +53,3 @@ void sigio_unlock(void)
{ {
spin_unlock(&sigio_spinlock); spin_unlock(&sigio_spinlock);
} }
extern void sigio_cleanup(void);
__uml_exitcall(sigio_cleanup);
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
...@@ -43,13 +43,13 @@ struct pollfds { ...@@ -43,13 +43,13 @@ struct pollfds {
/* Protected by sigio_lock(). Used by the sigio thread, but the UML thread /* Protected by sigio_lock(). Used by the sigio thread, but the UML thread
* synchronizes with it. * synchronizes with it.
*/ */
struct pollfds current_poll = { static struct pollfds current_poll = {
.poll = NULL, .poll = NULL,
.size = 0, .size = 0,
.used = 0 .used = 0
}; };
struct pollfds next_poll = { static struct pollfds next_poll = {
.poll = NULL, .poll = NULL,
.size = 0, .size = 0,
.used = 0 .used = 0
...@@ -156,7 +156,7 @@ static void update_thread(void) ...@@ -156,7 +156,7 @@ static void update_thread(void)
set_signals(flags); set_signals(flags);
} }
int add_sigio_fd(int fd, int read) static int add_sigio_fd(int fd, int read)
{ {
int err = 0, i, n, events; int err = 0, i, n, events;
...@@ -333,10 +333,12 @@ void maybe_sigio_broken(int fd, int read) ...@@ -333,10 +333,12 @@ void maybe_sigio_broken(int fd, int read)
add_sigio_fd(fd, read); add_sigio_fd(fd, read);
} }
void sigio_cleanup(void) static void sigio_cleanup(void)
{ {
if(write_sigio_pid != -1){ if(write_sigio_pid != -1){
os_kill_process(write_sigio_pid, 1); os_kill_process(write_sigio_pid, 1);
write_sigio_pid = -1; write_sigio_pid = -1;
} }
} }
__uml_exitcall(sigio_cleanup);
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册