UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Sebastian Ott 2013-04-30 17:18:46 +02:00 committed by Martin Schwidefsky
parent d1eb16e64f
commit fe72ffba3e
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/s390/kernel/setup.c
View File

@ -226,25 +226,17 @@ static void __init conmode_default(void)
} }
#ifdef CONFIG_ZFCPDUMP #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) if (ipl_info.type != IPL_TYPE_FCP_DUMP)
return; return;
if (OLDMEM_BASE) if (OLDMEM_BASE)
return; return;
if (console_devno != -1) strcat(boot_command_line, " cio_ignore=all,!ipldev,!condev");
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);
console_loglevel = 2; console_loglevel = 2;
} }
#else #else
static inline void setup_zfcpdump(unsigned int console_devno) {} static inline void setup_zfcpdump(void) {}
#endif /* CONFIG_ZFCPDUMP */ #endif /* CONFIG_ZFCPDUMP */
/* /*
@ -1097,5 +1089,5 @@ void __init setup_arch(char **cmdline_p)
set_preferred_console(); set_preferred_console();
/* Setup zfcpdump support */ /* Setup zfcpdump support */
setup_zfcpdump(console_devno); setup_zfcpdump();
} }