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

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: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7b5cc6ee

arch/um/include/irq_user.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ struct irq_fd { 
	int fd;

	int type;

	int irq;

	int pid;

	int events;

	int current_events;

};

arch/um/include/os.h

+1 −2
Original line number Diff line number Diff line
@@ -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);

arch/um/kernel/irq.c

+2 −4
Original line number Diff line number Diff line
@@ -107,10 +107,9 @@ int activate_fd(int irq, int fd, int type, void *dev_id) 
	struct pollfd *tmp_pfd;

	struct irq_fd *new_fd, *irq_fd;

	unsigned long flags;

	int pid, events, err, n;

	int events, err, n;



	pid = os_getpid();

	err = os_set_fd_async(fd, pid);

	err = os_set_fd_async(fd);

	if (err < 0)

		goto out;
@@ -127,7 +126,6 @@ int activate_fd(int irq, int fd, int type, void *dev_id) 
				     .fd 		= fd,

				     .type 		= type,

				     .irq 		= irq,

				     .pid  		= pid,

				     .events 		= events,

				     .current_events 	= 0 } );

arch/um/kernel/ksyms.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ EXPORT_SYMBOL(uml_strdup); 
EXPORT_SYMBOL(os_stat_fd);

EXPORT_SYMBOL(os_stat_file);

EXPORT_SYMBOL(os_access);

EXPORT_SYMBOL(os_get_exec_close);

EXPORT_SYMBOL(os_set_exec_close);

EXPORT_SYMBOL(os_getpid);

EXPORT_SYMBOL(os_open_file);

arch/um/kernel/smp.c

+2 −4
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ static int idle_proc(void *cpup) 
	if (err < 0)

		panic("CPU#%d failed to create IPI pipe, err = %d", cpu, -err);



	os_set_fd_async(cpu_data[cpu].ipi_pipe[0],

		     current->thread.mode.tt.extern_pid);

	os_set_fd_async(cpu_data[cpu].ipi_pipe[0]);



	wmb();

	if (cpu_test_and_set(cpu, cpu_callin_map)) {
@@ -128,8 +127,7 @@ void smp_prepare_cpus(unsigned int maxcpus) 
	if (err < 0)

		panic("CPU#0 failed to create IPI pipe, errno = %d", -err);



	os_set_fd_async(cpu_data[me].ipi_pipe[0],

		     current->thread.mode.tt.extern_pid);

	os_set_fd_async(cpu_data[me].ipi_pipe[0]);



	for (cpu = 1; cpu < ncpus; cpu++) {

		printk(KERN_INFO "Booting processor %d...\n", cpu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE