diff options
author | Michael Holzheu <holzheu@linux.vnet.ibm.com> | 2009-03-26 10:24:46 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-03-26 10:24:28 -0400 |
commit | 59f2e69d0f95bc00353628ef33fd534fbb8e3597 (patch) | |
tree | db7db7b66273939975c93cc4563d3f86e176e28c /arch/s390/kernel/setup.c | |
parent | 159d1ff8f6c38086ed75f8e892790d0a4f3a6b71 (diff) |
[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: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/setup.c')
-rw-r--r-- | arch/s390/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 91551ef1d67e..46fc981e02ba 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
@@ -226,7 +226,7 @@ static void __init conmode_default(void) | |||
226 | } | 226 | } |
227 | } | 227 | } |
228 | 228 | ||
229 | #if defined(CONFIG_ZFCPDUMP) || defined(CONFIG_ZFCPDUMP_MODULE) | 229 | #ifdef CONFIG_ZFCPDUMP |
230 | static void __init setup_zfcpdump(unsigned int console_devno) | 230 | static void __init setup_zfcpdump(unsigned int console_devno) |
231 | { | 231 | { |
232 | static char str[41]; | 232 | static char str[41]; |
@@ -515,7 +515,7 @@ static void __init setup_memory_end(void) | |||
515 | unsigned long max_mem; | 515 | unsigned long max_mem; |
516 | int i; | 516 | int i; |
517 | 517 | ||
518 | #if defined(CONFIG_ZFCPDUMP) || defined(CONFIG_ZFCPDUMP_MODULE) | 518 | #ifdef CONFIG_ZFCPDUMP |
519 | if (ipl_info.type == IPL_TYPE_FCP_DUMP) { | 519 | if (ipl_info.type == IPL_TYPE_FCP_DUMP) { |
520 | memory_end = ZFCPDUMP_HSA_SIZE; | 520 | memory_end = ZFCPDUMP_HSA_SIZE; |
521 | memory_end_set = 1; | 521 | memory_end_set = 1; |