Commit 6aa293d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull UML updates from Richard Weinberger:

 - DISCARD support for our block device driver

 - Many TLB flush optimizations

 - Various smaller fixes

 - And most important, Anton agreed to help me maintaining UML

* 'for-linus-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Remove obsolete reenable_XX calls
  um: writev needs <sys/uio.h>
  Add Anton Ivanov to UML maintainers
  um: remove redundant generic-y
  um: Optimize Flush TLB for force/fork case
  um: Avoid marking pages with "changed protection"
  um: Skip TLB flushing where not needed
  um: Optimize TLB operations v2
  um: Remove unnecessary faulted check in uaccess.c
  um: Add support for DISCARD in the UBD Driver
  um: Remove unsafe printks from the io thread
  um: Clean-up command processing in UML UBD driver
  um: Switch to block-mq constants in the UML UBD driver
  um: Make GCOV depend on !KCOV
  um: Include sys/uio.h to have writev()
  um: Add HAVE_DEBUG_BUGVERBOSE
  um: Update maintainers file entry
parents 04a17ede 940b241d

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -15951,15 +15951,16 @@ F: drivers/media/usb/zr364xx/ 
USER-MODE LINUX (UML)

M:	Jeff Dike <jdike@addtoit.com>

M:	Richard Weinberger <richard@nod.at>

M:	Anton Ivanov <anton.ivanov@cambridgegreys.com>

L:	linux-um@lists.infradead.org

W:	http://user-mode-linux.sourceforge.net

Q:	https://patchwork.ozlabs.org/project/linux-um/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git

S:	Maintained

F:	Documentation/virtual/uml/

F:	arch/um/

F:	arch/x86/um/

F:	fs/hostfs/

F:	fs/hppfs/



USERSPACE COPYIN/COPYOUT (UIOVEC)

M:	Alexander Viro <viro@zeniv.linux.org.uk>

arch/um/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config UML 
	select HAVE_UID16

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DEBUG_BUGVERBOSE

	select GENERIC_IRQ_SHOW

	select GENERIC_CPU_DEVICES

	select GENERIC_CLOCKEVENTS

arch/um/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config GPROF 
config GCOV

	bool "Enable gcov support"

	depends on DEBUG_INFO

	depends on !KCOV

	help

	  This option allows developers to retrieve coverage data from a UML

	  session.

arch/um/drivers/chan_kern.c

+0 −10
Original line number Diff line number Diff line
@@ -211,12 +211,6 @@ void deactivate_chan(struct chan *chan, int irq) 
		deactivate_fd(chan->fd, irq);

}



void reactivate_chan(struct chan *chan, int irq)

{

	if (chan && chan->enabled)

		reactivate_fd(chan->fd, irq);

}



int write_chan(struct chan *chan, const char *buf, int len,

	       int write_irq)

{
@@ -228,8 +222,6 @@ int write_chan(struct chan *chan, const char *buf, int len, 
	n = chan->ops->write(chan->fd, buf, len, chan->data);

	if (chan->primary) {

		ret = n;

		if ((ret == -EAGAIN) || ((ret >= 0) && (ret < len)))

			reactivate_fd(chan->fd, write_irq);

	}

	return ret;

}
@@ -527,8 +519,6 @@ void chan_interrupt(struct line *line, int irq) 
			tty_insert_flip_char(port, c, TTY_NORMAL);

	} while (err > 0);



	if (err == 0)

		reactivate_fd(chan->fd, irq);

	if (err == -EIO) {

		if (chan->primary) {

			tty_port_tty_hangup(&line->port, false);

arch/um/drivers/line.c

+0 −10
Original line number Diff line number Diff line
@@ -235,14 +235,6 @@ void line_unthrottle(struct tty_struct *tty) 


	line->throttled = 0;

	chan_interrupt(line, line->driver->read_irq);



	/*

	 * Maybe there is enough stuff pending that calling the interrupt

	 * throttles us again.  In this case, line->throttled will be 1

	 * again and we shouldn't turn the interrupt back on.

	 */

	if (!line->throttled)

		reactivate_chan(line->chan_in, line->driver->read_irq);

}



static irqreturn_t line_write_interrupt(int irq, void *data)
@@ -667,8 +659,6 @@ static irqreturn_t winch_interrupt(int irq, void *data) 
		tty_kref_put(tty);

	}

 out:

	if (winch->fd != -1)

		reactivate_fd(winch->fd, WINCH_IRQ);

	return IRQ_HANDLED;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE