Commit 749f0461 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 670bcd79 673deb0b

arch/s390/boot/uv.c

+0 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE