Commit 983dfa4b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull UML updates from Richard Weinberger:

 - Kconfig cleanups

 - Fix cpu_all_mask() usage

 - Various bug fixes

* tag 'for-linus-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: irq: don't set the chip for all irqs
  um: define set_pte_at() as a static inline function, not a macro
  um: remove uses of variable length arrays
  um: remove unused variable
  uml: fix a boot splat wrt use of cpu_all_mask
  um: Do not unlock mutex that is not hold.
  hostfs: fix mismatch between link_file definition and declaration
  arch: um: drivers: Kconfig: pedantic formatting
  arch: um: Kconfig: pedantic indention cleanups
  um: Revert to using stack for pt_regs in signal handling
parents 47782361 1987b1b8

arch/um/Kconfig

+31 −27
Original line number Diff line number Diff line
@@ -142,13 +142,17 @@ config MAGIC_SYSRQ 


config KERNEL_STACK_ORDER

	int "Kernel stack size order"

	default 1 if 64BIT

	range 1 10 if 64BIT

	default 0 if !64BIT

	default 2 if 64BIT

	range 2 10 if 64BIT

	default 1 if !64BIT

	help

	  This option determines the size of UML kernel stacks.  They will

	  be 1 << order pages.  The default is OK unless you're running Valgrind

	  on UML, in which case, set this to 3.

	  It is possible to reduce the stack to 1 for 64BIT and 0 for 32BIT on

	  older (pre-2017) CPUs. It is not recommended on newer CPUs due to the

	  increase in the size of the state which needs to be saved when handling

          signals.



config MMAPPER

	tristate "iomem emulation driver"

arch/um/drivers/Kconfig

+176 −176
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ config UML_NET_SLIRP 
	  to network by invoking a program that can handle SLIP encapsulated

	  packets.  This is commonly (but not limited to) the application

	  known as SLiRP, a program that can re-socket IP packets back onto

        the host on which it is run.  Only IP packets are supported,

	  he host on which it is run.  Only IP packets are supported,

	  unlike other network transports that can handle all Ethernet

	  frames.  In general, slirp allows the UML the same IP connectivity

	  to the outside world that the host user is permitted, and unlike

arch/um/drivers/ubd_kern.c

+2 −2
Original line number Diff line number Diff line
@@ -276,14 +276,14 @@ static int ubd_setup_common(char *str, int *index_out, char **error_out) 
		str++;

		if(!strcmp(str, "sync")){

			global_openflags = of_sync(global_openflags);

			goto out1;

			return err;

		}



		err = -EINVAL;

		major = simple_strtoul(str, &end, 0);

		if((*end != '\0') || (end == str)){

			*error_out = "Didn't parse major number";

			goto out1;

			return err;

		}



		mutex_lock(&ubd_lock);

arch/um/include/asm/pgtable.h

+6 −1
Original line number Diff line number Diff line
@@ -263,7 +263,12 @@ static inline void set_pte(pte_t *pteptr, pte_t pteval) 
	*pteptr = pte_mknewpage(*pteptr);

	if(pte_present(*pteptr)) *pteptr = pte_mknewprot(*pteptr);

}

#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)



static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,

			      pte_t *pteptr, pte_t pteval)

{

	set_pte(pteptr, pteval);

}



#define __HAVE_ARCH_PTE_SAME

static inline int pte_same(pte_t pte_a, pte_t pte_b)

arch/um/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ void __init init_IRQ(void) 
	irq_set_chip_and_handler(TIMER_IRQ, &SIGVTALRM_irq_type, handle_edge_irq);





	for (i = 1; i < NR_IRQS; i++)

	for (i = 1; i < LAST_IRQ; i++)

		irq_set_chip_and_handler(i, &normal_irq_type, handle_edge_irq);

	/* Initialize EPOLL Loop */

	os_setup_epoll();

CRA Git | Maintained and supported by SUSTech CRA and CCSE