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

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

Pull uml updates from Johannes Berg:

 - minor preparations for SMP support

 - SPARSE_IRQ support for kunit

 - help output cleanups

* tag 'uml-for-linux-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
  um: Remove unused ipi_pipe field from cpuinfo_um
  um: Remove unused cpu_data and current_cpu_data macros
  um: Stop tracking virtual CPUs via mm_cpumask()
  um: Centralize stub size calculations
  um: Remove outdated comment about STUB_DATA_PAGES
  um: Remove unused offset and child_err fields from stub_data
  um: Indent time-travel help messages
  um: Fix help message for ssl-non-raw
  um: vector: Fix indentation for help message
  um: Add missing trailing newline to help messages
  um: virtio-pci: implement .shutdown()
  um: Support SPARSE_IRQ
parents ba9dac98 e66ae377

arch/um/Kconfig

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

	select HAVE_SYSCALL_TRACEPOINTS

	select THREAD_INFO_IN_TASK

	select SPARSE_IRQ



config MMU

	bool

arch/um/drivers/ssl.c

+4 −1
Original line number Diff line number Diff line
@@ -199,4 +199,7 @@ static int ssl_non_raw_setup(char *str) 
	return 1;

}

__setup("ssl-non-raw", ssl_non_raw_setup);

__channel_help(ssl_non_raw_setup, "set serial lines to non-raw mode");
 
__uml_help(ssl_non_raw_setup,

"ssl-non-raw\n"

"    Set serial lines to non-raw mode.\n\n"

);

arch/um/drivers/ubd_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ __uml_help(ubd_setup, 
"    useful when a unique number should be given to the device. Note when\n"

"    specifying a label, the filename2 must be also presented. It can be\n"

"    an empty string, in which case the backing file is not used:\n"

"       ubd0=File,,Serial\n"

"       ubd0=File,,Serial\n\n"

);



static int udb_setup(char *str)

arch/um/drivers/virtio_pcidev.c

+6 −0
Original line number Diff line number Diff line
@@ -598,6 +598,11 @@ static void virtio_pcidev_virtio_remove(struct virtio_device *vdev) 
	kfree(dev);

}



static void virtio_pcidev_virtio_shutdown(struct virtio_device *vdev)

{

	/* nothing to do, we just don't want queue shutdown */

}



static struct virtio_device_id id_table[] = {

	{ CONFIG_UML_PCI_OVER_VIRTIO_DEVICE_ID, VIRTIO_DEV_ANY_ID },

	{ 0 },
@@ -609,6 +614,7 @@ static struct virtio_driver virtio_pcidev_virtio_driver = { 
	.id_table = id_table,

	.probe = virtio_pcidev_virtio_probe,

	.remove = virtio_pcidev_virtio_remove,

	.shutdown = virtio_pcidev_virtio_shutdown,

};



static int __init virtio_pcidev_init(void)

arch/um/include/asm/mmu_context.h

+0 −11
Original line number Diff line number Diff line
@@ -13,20 +13,9 @@ 
#include <asm/mm_hooks.h>

#include <asm/mmu.h>



#define activate_mm activate_mm

static inline void activate_mm(struct mm_struct *old, struct mm_struct *new)

{

}



static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, 

			     struct task_struct *tsk)

{

	unsigned cpu = smp_processor_id();



	if (prev != next) {

		cpumask_clear_cpu(cpu, mm_cpumask(prev));

		cpumask_set_cpu(cpu, mm_cpumask(next));

	}

}



#define init_new_context init_new_context