Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1af135a1 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/kdump: fix compile for !SMP 



Fix this compile error:

arch/s390/kernel/setup.c:875:2: error:
 implicit declaration of function 'smp_save_dump_cpus'

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 1592a8e4

arch/s390/include/asm/smp.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -55,6 +55,7 @@ static inline int smp_store_status(int cpu) { return 0; } 
static inline int smp_vcpu_scheduled(int cpu) { return 1; }

static inline int smp_vcpu_scheduled(int cpu) { return 1; }

static inline void smp_yield_cpu(int cpu) { }

static inline void smp_yield_cpu(int cpu) { }

static inline void smp_fill_possible_mask(void) { }

static inline void smp_fill_possible_mask(void) { }

static inline void smp_save_dump_cpus(void) { }





#endif /* CONFIG_SMP */

#endif /* CONFIG_SMP */

arch/s390/kernel/smp.c

+21 −23
Original line number Original line Diff line number Diff line
@@ -560,6 +560,25 @@ static void __smp_store_cpu_state(struct save_area_ext *sa_ext, u16 address, 
	memblock_free(vx_sa, PAGE_SIZE);

	memblock_free(vx_sa, PAGE_SIZE);

}

}





int smp_store_status(int cpu)

{

	unsigned long vx_sa;

	struct pcpu *pcpu;



	pcpu = pcpu_devices + cpu;

	if (__pcpu_sigp_relax(pcpu->address, SIGP_STOP_AND_STORE_STATUS,

			      0, NULL) != SIGP_CC_ORDER_CODE_ACCEPTED)

		return -EIO;

	if (!MACHINE_HAS_VX)

		return 0;

	vx_sa = __pa(pcpu->lowcore->vector_save_area_addr);

	__pcpu_sigp_relax(pcpu->address, SIGP_STORE_ADDITIONAL_STATUS,

			  vx_sa, NULL);

	return 0;

}



#endif /* CONFIG_CRASH_DUMP */



/*

/*

 * Collect CPU state of the previous, crashed system.

 * Collect CPU state of the previous, crashed system.

 * There are four cases:

 * There are four cases:
@@ -589,6 +608,7 @@ static void __smp_store_cpu_state(struct save_area_ext *sa_ext, u16 address, 
 */

 */

void __init smp_save_dump_cpus(void)

void __init smp_save_dump_cpus(void)

{

{

#ifdef CONFIG_CRASH_DUMP

	int addr, cpu, boot_cpu_addr, max_cpu_addr;

	int addr, cpu, boot_cpu_addr, max_cpu_addr;

	struct save_area_ext *sa_ext;

	struct save_area_ext *sa_ext;

	bool is_boot_cpu;

	bool is_boot_cpu;
@@ -629,30 +649,8 @@ void __init smp_save_dump_cpus(void) 
	}

	}

	diag308_reset();

	diag308_reset();

	pcpu_set_smt(0);

	pcpu_set_smt(0);

}



int smp_store_status(int cpu)

{

	unsigned long vx_sa;

	struct pcpu *pcpu;



	pcpu = pcpu_devices + cpu;

	if (__pcpu_sigp_relax(pcpu->address, SIGP_STOP_AND_STORE_STATUS,

			      0, NULL) != SIGP_CC_ORDER_CODE_ACCEPTED)

		return -EIO;

	if (!MACHINE_HAS_VX)

		return 0;

	vx_sa = __pa(pcpu->lowcore->vector_save_area_addr);

	__pcpu_sigp_relax(pcpu->address, SIGP_STORE_ADDITIONAL_STATUS,

			  vx_sa, NULL);

	return 0;

}



#else

void smp_save_dump_cpus(void)

{

}

#endif /* CONFIG_CRASH_DUMP */

#endif /* CONFIG_CRASH_DUMP */

}





void smp_cpu_set_polarization(int cpu, int val)

void smp_cpu_set_polarization(int cpu, int val)

{

{