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

Commit 59f2e69d authored by Michael Holzheu's avatar Michael Holzheu Committed by Martin Schwidefsky
Browse files

[S390] zfcpdump: Prevent zcore from beeing built as a kernel module. 



The zcore code switches to real addressing mode when creating a kernel dump.
This is not possible, if it is built as a kernel module. With this patch
zcore (zfcpdump) can't be built as a kernel module any more.

Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 159d1ff8

arch/s390/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ config KEXEC 
	  but is independent of hardware/microcode support.



config ZFCPDUMP

	tristate "zfcpdump support"

	bool "zfcpdump support"

	select SMP

	default n

	help

arch/s390/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static void __init conmode_default(void) 
	}

}



#if defined(CONFIG_ZFCPDUMP) || defined(CONFIG_ZFCPDUMP_MODULE)

#ifdef CONFIG_ZFCPDUMP

static void __init setup_zfcpdump(unsigned int console_devno)

{

	static char str[41];
@@ -515,7 +515,7 @@ static void __init setup_memory_end(void) 
	unsigned long max_mem;

	int i;



#if defined(CONFIG_ZFCPDUMP) || defined(CONFIG_ZFCPDUMP_MODULE)

#ifdef CONFIG_ZFCPDUMP

	if (ipl_info.type == IPL_TYPE_FCP_DUMP) {

		memory_end = ZFCPDUMP_HSA_SIZE;

		memory_end_set = 1;

arch/s390/kernel/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ EXPORT_SYMBOL(smp_ctl_clear_bit); 
 */

#define CPU_INIT_NO	1



#if defined(CONFIG_ZFCPDUMP) || defined(CONFIG_ZFCPDUMP_MODULE)

#ifdef CONFIG_ZFCPDUMP



/*

 * zfcpdump_prefix_array holds prefix registers for the following scenario:
@@ -267,7 +267,7 @@ EXPORT_SYMBOL_GPL(zfcpdump_save_areas); 


static inline void smp_get_save_area(unsigned int cpu, unsigned int phy_cpu) { }



#endif /* CONFIG_ZFCPDUMP || CONFIG_ZFCPDUMP_MODULE */

#endif /* CONFIG_ZFCPDUMP */



static int cpu_stopped(int cpu)

{