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

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

Pull UML fixes from Richard Weinberger:

 - Make sure to set a default console, otherwise ttynull is selected

 - Revert initial ARCH_HAS_SET_MEMORY support, this needs more work

 - Fix a regression due to ubd refactoring

 - Various small fixes

* tag 'for-linus-5.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: time: fix initialization in time-travel mode
  um: fix os_idle_sleep() to not hang
  Revert "um: support some of ARCH_HAS_SET_MEMORY"
  Revert "um: allocate a guard page to helper threads"
  um: virtio: free vu_dev only with the contained struct device
  um: kmsg_dumper: always dump when not tty console
  um: stdio_console: Make preferred console
  um: return error from ioremap()
  um: ubd: fix command line handling of ubd
parents 3afe9076 7f341422

arch/um/Kconfig

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

	select HAVE_DEBUG_BUGVERBOSE

	select NO_DMA

	select ARCH_HAS_SET_MEMORY

	select GENERIC_IRQ_SHOW

	select GENERIC_CPU_DEVICES

	select HAVE_GCC_PLUGINS

arch/um/drivers/ubd_kern.c

+3 −3
Original line number Diff line number Diff line
@@ -375,11 +375,11 @@ static int ubd_setup_common(char *str, int *index_out, char **error_out) 
		file = NULL;



	backing_file = strsep(&str, ",:");

	if (*backing_file == '\0')

	if (backing_file && *backing_file == '\0')

		backing_file = NULL;



	serial = strsep(&str, ",:");

	if (*serial == '\0')

	if (serial && *serial == '\0')

		serial = NULL;



	if (backing_file && ubd_dev->no_cow) {
@@ -1241,7 +1241,7 @@ static int __init ubd_driver_init(void){ 
		/* Letting ubd=sync be like using ubd#s= instead of ubd#= is

		 * enough. So use anyway the io thread. */

	}

	stack = alloc_stack(0);

	stack = alloc_stack(0, 0);

	io_pid = start_io_thread(stack + PAGE_SIZE - sizeof(void *),

				 &thread_fd);

	if(io_pid < 0){

arch/um/drivers/virtio_uml.c

+2 −1
Original line number Diff line number Diff line
@@ -1084,6 +1084,7 @@ static void virtio_uml_release_dev(struct device *d) 
	}



	os_close_file(vu_dev->sock);

	kfree(vu_dev);

}



/* Platform device */
@@ -1097,7 +1098,7 @@ static int virtio_uml_probe(struct platform_device *pdev) 
	if (!pdata)

		return -EINVAL;



	vu_dev = devm_kzalloc(&pdev->dev, sizeof(*vu_dev), GFP_KERNEL);

	vu_dev = kzalloc(sizeof(*vu_dev), GFP_KERNEL);

	if (!vu_dev)

		return -ENOMEM;

arch/um/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#define ioremap ioremap

static inline void __iomem *ioremap(phys_addr_t offset, size_t size)

{

	return (void __iomem *)(unsigned long)offset;

	return NULL;

}



#define iounmap iounmap

arch/um/include/asm/pgtable.h

+0 −3
Original line number Diff line number Diff line
@@ -55,15 +55,12 @@ extern unsigned long end_iomem; 
#define _PAGE_CHG_MASK	(PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)

#define __PAGE_KERNEL_EXEC                                              \

	 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)

#define __PAGE_KERNEL_RO						\

	 (_PAGE_PRESENT | _PAGE_DIRTY | _PAGE_ACCESSED)

#define PAGE_NONE	__pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED)

#define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED)

#define PAGE_COPY	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)

#define PAGE_READONLY	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)

#define PAGE_KERNEL	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)

#define PAGE_KERNEL_EXEC	__pgprot(__PAGE_KERNEL_EXEC)

#define PAGE_KERNEL_RO		__pgprot(__PAGE_KERNEL_RO)



/*

 * The i386 can't do page protection for execute, and considers that the same