Commit 9bb9d4fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml 

Pull UML updates from Richard Weinberger:

 - removal of old and dead code

 - a bug fix for our tty driver

 - other minor cleanups across the code base

* 'for-linus-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Make line/tty semantics use true write IRQ
  um: trap: fix spelling mistake, EACCESS -> EACCES
  um: Don't hardcode path as it is architecture dependent
  um: NULL check before kfree is not needed
  um: remove unused AIO code
  um: Give start_idle_thread() a return code
  um: Remove update_debugregs()
  um: Drop own definition of PTRACE_SYSEMU/_SINGLESTEP
parents adb6b2b2 917e2fd2

arch/um/drivers/line.c

+2 −2
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data) 
	if (err == 0) {

		spin_unlock(&line->lock);

		return IRQ_NONE;

	} else if (err < 0) {

	} else if ((err < 0) && (err != -EAGAIN)) {

		line->head = line->buffer;

		line->tail = line->buffer;

	}
@@ -284,7 +284,7 @@ int line_setup_irq(int fd, int input, int output, struct line *line, void *data) 
	if (err)

		return err;

	if (output)

		err = um_request_irq(driver->write_irq, fd, IRQ_NONE,

		err = um_request_irq(driver->write_irq, fd, IRQ_WRITE,

				     line_write_interrupt, IRQF_SHARED,

				     driver->write_irq_name, data);

	return err;

arch/um/drivers/port_user.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int port_connection(int fd, int *socket, int *pid_out) 
{

	int new, err;

	char *argv[] = { "/usr/sbin/in.telnetd", "-L",

			 "/usr/lib/uml/port-helper", NULL };

			 OS_LIB_PATH "/uml/port-helper", NULL };

	struct port_pre_exec_data data;



	new = accept(fd, NULL, 0);

arch/um/drivers/vector_kern.c

+5 −10
Original line number Diff line number Diff line
@@ -1118,15 +1118,10 @@ static int vector_net_close(struct net_device *dev) 
		os_close_file(vp->fds->tx_fd);

		vp->fds->tx_fd = -1;

	}

	if (vp->bpf != NULL)

	kfree(vp->bpf);

	if (vp->fds->remote_addr != NULL)

	kfree(vp->fds->remote_addr);

	if (vp->transport_data != NULL)

	kfree(vp->transport_data);

	if (vp->header_rxbuffer != NULL)

	kfree(vp->header_rxbuffer);

	if (vp->header_txbuffer != NULL)

	kfree(vp->header_txbuffer);

	if (vp->rx_queue != NULL)

		destroy_queue(vp->rx_queue);

arch/um/drivers/vector_user.c

+2 −4
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ cleanup: 
		os_close_file(rxfd);

	if (txfd >= 0)

		os_close_file(txfd);

	if (result != NULL)

	kfree(result);

	return NULL;

}
@@ -434,7 +433,6 @@ cleanup: 
	if (fd >= 0)

		os_close_file(fd);

	if (result != NULL) {

		if (result->remote_addr != NULL)

		kfree(result->remote_addr);

		kfree(result);

	}

arch/um/include/shared/aio.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2004 Jeff Dike (jdike@karaya.com)

 * Licensed under the GPL

 */



#ifndef AIO_H__

#define AIO_H__



enum aio_type { AIO_READ, AIO_WRITE, AIO_MMAP };



struct aio_thread_reply {

	void *data;

	int err;

};



struct aio_context {

	int reply_fd;

	struct aio_context *next;

};



#define INIT_AIO_CONTEXT { .reply_fd	= -1, \

			   .next	= NULL }



extern int submit_aio(enum aio_type type, int fd, char *buf, int len,

		      unsigned long long offset, int reply_fd,

                      struct aio_context *aio);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE