Skip to content

Commit

Permalink
s390/zfcpdump: exploit new cio_ignore keywords
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sebastian Ott authored and Martin Schwidefsky committed May 2, 2013
1 parent d1eb16e commit fe72ffb
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions arch/s390/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

/*
Expand Down Expand Up @@ -1097,5 +1089,5 @@ void __init setup_arch(char **cmdline_p)
set_preferred_console();

/* Setup zfcpdump support */
setup_zfcpdump(console_devno);
setup_zfcpdump();
}

0 comments on commit fe72ffb

Please sign in to comment.