diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-10 08:44:35 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-10 08:44:35 +0200 |
| commit | 3d647e62686f447ca4c9ba6b4500fed5f0368a98 (patch) | |
| tree | 61b08495f1018fa0846e9aac9bbec901f25fdfbf /arch/s390/kernel/early_printk.c | |
| parent | 701f2eb6f9382409bfa1e68a62729d6e5de54eef (diff) | |
| parent | 7c75544983edece1b745367922cf1053606cd369 (diff) | |
Merge tag 's390-4.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Martin writes:
"s390 fixes for 4.19-rc8
Four more patches for 4.19:
- Fix resume after suspend-to-disk if resume-CPU != suspend-CPU
- Fix vfio-ccw check for pinned pages
- Two patches to avoid a usercopy-whitelist warning in vfio-ccw"
* tag 's390-4.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/cio: Fix how vfio-ccw checks pinned pages
s390/cio: Refactor alloc of ccw_io_region
s390/cio: Convert ccw_io_region to pointer
s390/hibernate: fix error handling when suspend cpu != resume cpu
Diffstat (limited to 'arch/s390/kernel/early_printk.c')
| -rw-r--r-- | arch/s390/kernel/early_printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/early_printk.c b/arch/s390/kernel/early_printk.c index 9431784d7796..40c1dfec944e 100644 --- a/arch/s390/kernel/early_printk.c +++ b/arch/s390/kernel/early_printk.c @@ -10,7 +10,7 @@ static void sclp_early_write(struct console *con, const char *s, unsigned int len) { - __sclp_early_printk(s, len); + __sclp_early_printk(s, len, 0); } static struct console sclp_early_console = { |