s390 updates for 5.7-rc3
Subsystems (4)
Vasily Gorbik
maintainerHello Linus,
please pull s390 changes for 5.7-rc3.
Thank you,
Vasily
The following changes since commit ae83d0b416db002fe95601e7f97f64b59514d936:
Linux 5.7-rc2 (2020-04-19 14:35:30 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.7-3
for you to fetch changes up to 673deb0beba5d39c2e0bc6536e00b03b6ef59cc0:
s390/protvirt: fix compilation issue (2020-04-25 10:17:24 +0200)
----------------------------------------------------------------
s390 fixes for 5.7-rc3
- Add few notrace annotations to avoid potential crashes when switching ftrace tracers.
- Avoid setting affinity for floating irqs in pci code.
- Fix build issue found by kbuild test robot.
----------------------------------------------------------------
Claudio Imbrenda (1):
s390/protvirt: fix compilation issue
Niklas Schnelle (1):
s390/pci: do not set affinity for floating irqs
Philipp Rudo (1):
s390/ftrace: fix potential crashes when switching tracers
arch/s390/boot/uv.c | 2 -- arch/s390/kernel/diag.c | 2 +- arch/s390/kernel/smp.c | 4 ++-- arch/s390/kernel/trace.c | 2 +- arch/s390/kernel/uv.c | 3 ++- arch/s390/pci/pci_irq.c | 5 +++-- 6 files changed, 9 insertions(+), 9 deletions(-)
arch/s390/boot/uv.c +0 -2
@@ -7,9 +7,7 @@#ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST int __bootdata_preserved (prot_virt_guest );#endif -#if IS_ENABLED (CONFIG_KVM )struct uv_info __bootdata_preserved (uv_info ); -#endif void uv_query_info (void ) {
arch/s390/kernel/diag.c +1 -1
@@ -133,7 +133,7 @@ void diag_stat_inc(enum diag_stat_enum nr) }EXPORT_SYMBOL (diag_stat_inc); -void diag_stat_inc_norecursion (enum diag_stat_enum nr) +void notrace diag_stat_inc_norecursion(enum diag_stat_enum nr) {this_cpu_inc (diag_stat.counter[nr]);trace_s390_diagnose_norecursion (diag_map[nr].code);
arch/s390/kernel/smp.c +2 -2
@@ -403,7 +403,7 @@ int smp_find_processor_id(u16 address)return -1 ; } -bool arch_vcpu_is_preempted (int cpu) +bool notrace arch_vcpu_is_preempted(int cpu) {if (test_cpu_flag_of (CIF_ENABLED_WAIT , cpu))return false;
@@ -413,7 +413,7 @@ bool arch_vcpu_is_preempted(int cpu) }EXPORT_SYMBOL (arch_vcpu_is_preempted); -void smp_yield_cpu (int cpu) +void notrace smp_yield_cpu(int cpu) {if (!MACHINE_HAS_DIAG9C )return ;
arch/s390/kernel/trace.c +1 -1
@@ -14,7 +14,7 @@ EXPORT_TRACEPOINT_SYMBOL(s390_diagnose); static DEFINE_PER_CPU(unsigned int, diagnose_trace_depth); -void trace_s390_diagnose_norecursion (int diag_nr) +void notrace trace_s390_diagnose_norecursion(int diag_nr) {unsigned long flags;unsigned int *depth;
arch/s390/kernel/uv.c +2 -1
@@ -23,10 +23,11 @@int __bootdata_preserved (prot_virt_guest );#endif +struct uv_info __bootdata_preserved (uv_info ); +#if IS_ENABLED (CONFIG_KVM )int prot_virt_host;EXPORT_SYMBOL (prot_virt_host); -struct uv_info __bootdata_preserved (uv_info );EXPORT_SYMBOL (uv_info);static int __init prot_virt_setup (char *val)
arch/s390/pci/pci_irq.c +3 -2
@@ -115,7 +115,6 @@ static struct irq_chip zpci_irq_chip = { .name = "PCI-MSI", .irq_unmask = pci_msi_unmask_irq, .irq_mask = pci_msi_mask_irq, - .irq_set_affinity = zpci_set_irq_affinity, };static void zpci_handle_cpu_local_irq (bool rescan)
@@ -276,7 +275,9 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) rc = -EIO ;if (hwirq - bit >= msi_vecs)break ; - irq =__irq_alloc_descs (-1 ,0 ,1 ,0 ,THIS_MODULE , msi->affinity); + irq =__irq_alloc_descs (-1 ,0 ,1 ,0 ,THIS_MODULE , + (irq_delivery ==DIRECTED ) ? + msi->affinity :NULL );if (irq <0 )return -ENOMEM ; rc =irq_set_msi_desc (irq, msi);
The pull request you sent on Sun, 26 Apr 2020 09:39:21 +0200:
The pull request you sent on Sun, 26 Apr 2020 09:39:21 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.gittags/s390-5.7-3
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/749f04615a3d435e98a13cc1e38be10774e1c64b
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker