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

Commit f2772a0e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull UML updates from Richard Weinberger:

 - A new timer mode, time travel, for testing with UML

 - Many bugixes/improvements for the serial line driver

 - Various bugfixes

* tag 'for-linus-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: fix build without CONFIG_UML_TIME_TRAVEL_SUPPORT
  um: Fix kcov crash during startup
  um: configs: Remove useless UEVENT_HELPER_PATH
  um: Support time travel mode
  um: Pass nsecs to os timer functions
  um: Remove drivers/ssl.h
  um: Don't garbage collect in deactivate_all_fds()
  um: Silence lockdep complaint about mmap_sem
  um: Remove locking in deactivate_all_fds()
  um: Timer code cleanup
  um: fix os_timer_one_shot()
  um: Fix IRQ controller regression on console read
parents fcd98147 b482e48d

arch/um/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -184,6 +184,18 @@ config SECCOMP 


	  If unsure, say Y.



config UML_TIME_TRAVEL_SUPPORT

	bool

	prompt "Support time-travel mode (e.g. for test execution)"

	help

	  Enable this option to support time travel inside the UML instance.



	  After enabling this option, two modes are accessible at runtime

	  (selected by the kernel command line), see the kernel's command-

	  line help for more details.



	  It is safe to say Y, but you probably don't need this.



endmenu



source "arch/um/drivers/Kconfig"

arch/um/configs/i386_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ CONFIG_XTERM_CHAN=y 
CONFIG_CON_CHAN="pts"

CONFIG_SSL_CHAN="pts"

CONFIG_UML_SOUND=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_BLK_DEV_UBD=y

arch/um/configs/x86_64_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ CONFIG_XTERM_CHAN=y 
CONFIG_CON_CHAN="pts"

CONFIG_SSL_CHAN="pts"

CONFIG_UML_SOUND=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_BLK_DEV_UBD=y

arch/um/drivers/chan_kern.c

+44 −8
Original line number Diff line number Diff line
@@ -171,19 +171,55 @@ int enable_chan(struct line *line) 
	return err;

}



/* Items are added in IRQ context, when free_irq can't be called, and

 * removed in process context, when it can.

 * This handles interrupt sources which disappear, and which need to

 * be permanently disabled.  This is discovered in IRQ context, but

 * the freeing of the IRQ must be done later.

 */

static DEFINE_SPINLOCK(irqs_to_free_lock);

static LIST_HEAD(irqs_to_free);



void free_irqs(void)

{

	struct chan *chan;

	LIST_HEAD(list);

	struct list_head *ele;

	unsigned long flags;



	spin_lock_irqsave(&irqs_to_free_lock, flags);

	list_splice_init(&irqs_to_free, &list);

	spin_unlock_irqrestore(&irqs_to_free_lock, flags);



	list_for_each(ele, &list) {

		chan = list_entry(ele, struct chan, free_list);



		if (chan->input && chan->enabled)

			um_free_irq(chan->line->driver->read_irq, chan);

		if (chan->output && chan->enabled)

			um_free_irq(chan->line->driver->write_irq, chan);

		chan->enabled = 0;

	}

}



static void close_one_chan(struct chan *chan, int delay_free_irq)

{

	unsigned long flags;



	if (!chan->opened)

		return;



    /* we can safely call free now - it will be marked

     *  as free and freed once the IRQ stopped processing

     */

	if (delay_free_irq) {

		spin_lock_irqsave(&irqs_to_free_lock, flags);

		list_add(&chan->free_list, &irqs_to_free);

		spin_unlock_irqrestore(&irqs_to_free_lock, flags);

	} else {

		if (chan->input && chan->enabled)

			um_free_irq(chan->line->driver->read_irq, chan);

		if (chan->output && chan->enabled)

			um_free_irq(chan->line->driver->write_irq, chan);

		chan->enabled = 0;

	}

	if (chan->ops->close != NULL)

		(*chan->ops->close)(chan->fd, chan->data);

arch/um/drivers/ssl.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/console.h>

#include <asm/termbits.h>

#include <asm/irq.h>

#include "ssl.h"

#include "chan.h"

#include <init.h>

#include <irq_user.h>