Skip to content

Commit

Permalink
[S390] zfcpdump: Prevent zcore from beeing built as a kernel module.
Browse files Browse the repository at this point in the history
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: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Michael Holzheu authored and Martin Schwidefsky committed Mar 26, 2009
1 parent 159d1ff commit 59f2e69
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/s390/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions arch/s390/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions arch/s390/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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)
{
Expand Down

0 comments on commit 59f2e69

Please sign in to comment.