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

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

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

Pull UML updates from Richard Weinberger:

 - virtio support

 - fixes for our new time travel mode

 - various improvements to make lockdep and kasan work better

 - SPDX header updates

* tag 'for-linus-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (25 commits)
  um: irq: Fix LAST_IRQ usage in init_IRQ()
  um: Add SPDX headers for files in arch/um/include
  um: Add SPDX headers for files in arch/um/os-Linux
  um: Add SPDX headers to files in arch/um/kernel/
  um: Add SPDX headers for files in arch/um/drivers
  um: virtio: Implement VHOST_USER_PROTOCOL_F_REPLY_ACK
  um: virtio: Implement VHOST_USER_PROTOCOL_F_SLAVE_REQ
  um: drivers: Add virtio vhost-user driver
  um: Use real DMA barriers
  um: Don't use generic barrier.h
  um: time-travel: Restrict time update in IRQ handler
  um: time-travel: Fix periodic timers
  um: Enable CONFIG_CONSTRUCTORS
  um: Place (soft)irq text with macros
  um: Fix VDSO compiler warning
  um: Implement TRACE_IRQFLAGS_SUPPORT
  um: Remove misleading #define ARCh_IRQ_ENABLED
  um: Avoid using uninitialized regs
  um: Remove sig_info[SIGALRM]
  um: Error handling fixes in vector drivers
  ...
parents 4553d469 73625ed6

arch/um/drivers/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -335,3 +335,10 @@ config UML_NET_SLIRP 
	  Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp"



endmenu



config VIRTIO_UML

	tristate "UML driver for virtio devices"

	select VIRTIO

	help

	  This driver provides support for virtio based paravirtual device

	  drivers over vhost-user sockets.

arch/um/drivers/Makefile

+2 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# 

# Copyright (C) 2000, 2002, 2003 Jeff Dike (jdike@karaya.com)

# Licensed under the GPL

#



# pcap is broken in 2.5 because kbuild doesn't allow pcap.a to be linked
@@ -61,6 +61,7 @@ obj-$(CONFIG_XTERM_CHAN) += xterm.o xterm_kern.o 
obj-$(CONFIG_UML_WATCHDOG) += harddog.o

obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o

obj-$(CONFIG_UML_RANDOM) += random.o

obj-$(CONFIG_VIRTIO_UML) += virtio_uml.o



# pcap_user.o must be added explicitly.

USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o vector_user.o

arch/um/drivers/chan.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* 

 * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)

 * Licensed under the GPL

 */



#ifndef __CHAN_KERN_H__

arch/um/drivers/chan_kern.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com)

 * Licensed under the GPL

 */



#include <linux/slab.h>

arch/um/drivers/chan_user.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com)

 * Licensed under the GPL

 */



#include <stdlib.h>