s390/zfcpdump: exploit new cio_ignore keywords

Use the 'ipldev' and 'condev' cio_ignore keywords to setup the
command line for zfcpdump.

Reviewed-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 0f419c5765c86993e4aa48fb8c9bcd702aa4bf7d..a2574f192bb0b2ff26273b0d2822c4b74257a336 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -226,25 +226,17 @@ static void __init conmode_default(void)
 }
 
 #ifdef CONFIG_ZFCPDUMP
-static void __init setup_zfcpdump(unsigned int console_devno)
+static void __init setup_zfcpdump(void)
 {
-       static char str[41];
-
        if (ipl_info.type != IPL_TYPE_FCP_DUMP)
                return;
        if (OLDMEM_BASE)
                return;
-       if (console_devno != -1)
-               sprintf(str, " cio_ignore=all,!0.0.%04x,!0.0.%04x",
-                       ipl_info.data.fcp.dev_id.devno, console_devno);
-       else
-               sprintf(str, " cio_ignore=all,!0.0.%04x",
-                       ipl_info.data.fcp.dev_id.devno);
-       strcat(boot_command_line, str);
+       strcat(boot_command_line, " cio_ignore=all,!ipldev,!condev");
        console_loglevel = 2;
 }
 #else
-static inline void setup_zfcpdump(unsigned int console_devno) {}
+static inline void setup_zfcpdump(void) {}
 #endif /* CONFIG_ZFCPDUMP */
 
  /*
@@ -1097,5 +1089,5 @@ void __init setup_arch(char **cmdline_p)
        set_preferred_console();
 
        /* Setup zfcpdump support */
-       setup_zfcpdump(console_devno);
+       setup_zfcpdump();
 }