Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29ac1c21 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: make some symbols static 



A few sigio-related things can be made static.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 61232f2f

arch/um/include/os.h

+0 −1
Original line number Diff line number Diff line
@@ -329,7 +329,6 @@ extern void os_set_ioignore(void); 
extern void init_irq_signals(int on_sigstack);



/* sigio.c */

extern int add_sigio_fd(int fd, int read);

extern int ignore_sigio_fd(int fd);

extern void maybe_sigio_broken(int fd, int read);

arch/um/kernel/sigio_kern.c

+0 −14
Original line number Diff line number Diff line
@@ -53,17 +53,3 @@ void sigio_unlock(void) 
{

	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:

 */

arch/um/os-Linux/sigio.c

+6 −4
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ struct pollfds { 
/* Protected by sigio_lock().  Used by the sigio thread, but the UML thread

 * synchronizes with it.

 */

struct pollfds current_poll = {

static struct pollfds current_poll = {

	.poll  		= NULL,

	.size 		= 0,

	.used 		= 0

};



struct pollfds next_poll = {

static struct pollfds next_poll = {

	.poll  		= NULL,

	.size 		= 0,

	.used 		= 0
@@ -156,7 +156,7 @@ static void update_thread(void) 
	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;
@@ -333,10 +333,12 @@ void maybe_sigio_broken(int fd, int read) 
	add_sigio_fd(fd, read);

}



void sigio_cleanup(void)

static void sigio_cleanup(void)

{

	if(write_sigio_pid != -1){

		os_kill_process(write_sigio_pid, 1);

		write_sigio_pid = -1;

	}

}



__uml_exitcall(sigio_cleanup);