From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 1 Sep 2021 23:24:22 +0000 (+1000)
Subject: Merge remote-tracking branch 'powerpc/next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0b2f92969a26ff099f6293afc75d330d8103a65e;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'powerpc/next'

# Conflicts:
#	arch/powerpc/sysdev/xive/common.c
---

0b2f92969a26ff099f6293afc75d330d8103a65e
diff --cc arch/powerpc/Kconfig
index 678a0acbad7b1,ec866085ff8b1..8a93b509337d6
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -182,7 -183,10 +183,8 @@@ config PP
  	select GENERIC_IRQ_SHOW
  	select GENERIC_IRQ_SHOW_LEVEL
  	select GENERIC_PCI_IOMAP		if PCI
+ 	select GENERIC_PTDUMP
  	select GENERIC_SMP_IDLE_THREAD
 -	select GENERIC_STRNCPY_FROM_USER
 -	select GENERIC_STRNLEN_USER
  	select GENERIC_TIME_VSYSCALL
  	select GENERIC_VDSO_TIME_NS
  	select HAVE_ARCH_AUDITSYSCALL
diff --cc arch/powerpc/sysdev/xive/common.c
index 8183ca343675a,458645c7a72bf..c732ce5a3e1a5
--- a/arch/powerpc/sysdev/xive/common.c
+++ b/arch/powerpc/sysdev/xive/common.c
@@@ -1170,22 -1166,6 +1157,22 @@@ out
  	return ret;
  }
  
 +static int xive_request_ipi(unsigned int cpu)
 +{
 +	struct xive_ipi_desc *xid = &xive_ipis[early_cpu_to_node(cpu)];
 +	int ret;
 +
 +	if (atomic_inc_return(&xid->started) > 1)
 +		return 0;
 +
 +	ret = request_irq(xid->irq, xive_muxed_ipi_action,
- 			  IRQF_PERCPU | IRQF_NO_THREAD,
++			  IRQF_NO_DEBUG | IRQF_PERCPU | IRQF_NO_THREAD,
 +			  xid->name, NULL);
 +
 +	WARN(ret < 0, "Failed to request IPI %d: %d\n", xid->irq, ret);
 +	return ret;
 +}
 +
  static int xive_setup_cpu_ipi(unsigned int cpu)
  {
  	unsigned int xive_ipi_irq = xive_ipi_cpu_to_irq(cpu);