tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 's390-5.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Vasily Gorbik:

- Add a 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.

* tag 's390-5.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/protvirt: fix compilation issue
s390/pci: do not set affinity for floating irqs
s390/ftrace: fix potential crashes when switching tracers

Linus Torvalds 749f0461 670bcd79

+9 -9
-2
arch/s390/boot/uv.c
··· 7 7 #ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST 8 8 int __bootdata_preserved(prot_virt_guest); 9 9 #endif 10 - #if IS_ENABLED(CONFIG_KVM) 11 10 struct uv_info __bootdata_preserved(uv_info); 12 - #endif 13 11 14 12 void uv_query_info(void) 15 13 {
+1 -1
arch/s390/kernel/diag.c
··· 133 133 } 134 134 EXPORT_SYMBOL(diag_stat_inc); 135 135 136 - void diag_stat_inc_norecursion(enum diag_stat_enum nr) 136 + void notrace diag_stat_inc_norecursion(enum diag_stat_enum nr) 137 137 { 138 138 this_cpu_inc(diag_stat.counter[nr]); 139 139 trace_s390_diagnose_norecursion(diag_map[nr].code);
+2 -2
arch/s390/kernel/smp.c
··· 403 403 return -1; 404 404 } 405 405 406 - bool arch_vcpu_is_preempted(int cpu) 406 + bool notrace arch_vcpu_is_preempted(int cpu) 407 407 { 408 408 if (test_cpu_flag_of(CIF_ENABLED_WAIT, cpu)) 409 409 return false; ··· 413 413 } 414 414 EXPORT_SYMBOL(arch_vcpu_is_preempted); 415 415 416 - void smp_yield_cpu(int cpu) 416 + void notrace smp_yield_cpu(int cpu) 417 417 { 418 418 if (!MACHINE_HAS_DIAG9C) 419 419 return;
+1 -1
arch/s390/kernel/trace.c
··· 14 14 15 15 static DEFINE_PER_CPU(unsigned int, diagnose_trace_depth); 16 16 17 - void trace_s390_diagnose_norecursion(int diag_nr) 17 + void notrace trace_s390_diagnose_norecursion(int diag_nr) 18 18 { 19 19 unsigned long flags; 20 20 unsigned int *depth;
+2 -1
arch/s390/kernel/uv.c
··· 23 23 int __bootdata_preserved(prot_virt_guest); 24 24 #endif 25 25 26 + struct uv_info __bootdata_preserved(uv_info); 27 + 26 28 #if IS_ENABLED(CONFIG_KVM) 27 29 int prot_virt_host; 28 30 EXPORT_SYMBOL(prot_virt_host); 29 - struct uv_info __bootdata_preserved(uv_info); 30 31 EXPORT_SYMBOL(uv_info); 31 32 32 33 static int __init prot_virt_setup(char *val)
+3 -2
arch/s390/pci/pci_irq.c
··· 115 115 .name = "PCI-MSI", 116 116 .irq_unmask = pci_msi_unmask_irq, 117 117 .irq_mask = pci_msi_mask_irq, 118 - .irq_set_affinity = zpci_set_irq_affinity, 119 118 }; 120 119 121 120 static void zpci_handle_cpu_local_irq(bool rescan) ··· 275 276 rc = -EIO; 276 277 if (hwirq - bit >= msi_vecs) 277 278 break; 278 - irq = __irq_alloc_descs(-1, 0, 1, 0, THIS_MODULE, msi->affinity); 279 + irq = __irq_alloc_descs(-1, 0, 1, 0, THIS_MODULE, 280 + (irq_delivery == DIRECTED) ? 281 + msi->affinity : NULL); 279 282 if (irq < 0) 280 283 return -ENOMEM; 281 284 rc = irq_set_msi_desc(irq, msi);