diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-02 08:23:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-02 08:23:43 +0200 |
| commit | 16ecf49c10a1e8ecf917f91b93dd85624349e930 (patch) | |
| tree | f05d0a17219ae9173c45deee57b06e807632c6d0 /drivers/tty/vt | |
| parent | vt: unicode fallback for scrollback (diff) | |
| parent | Linux 4.18-rc3 (diff) | |
| download | linux-16ecf49c10a1e8ecf917f91b93dd85624349e930.tar.xz linux-16ecf49c10a1e8ecf917f91b93dd85624349e930.zip | |
Merge 4.18-rc3 into tty-next
We want ths tty core changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt')
| -rw-r--r-- | drivers/tty/vt/vt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 2d14bb195d98..846dfedb657d 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -1040,7 +1040,7 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ if (!*vc->vc_uni_pagedir_loc) con_set_default_unimap(vc); - vc->vc_screenbuf = kmalloc(vc->vc_screenbuf_size, GFP_KERNEL); + vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size, GFP_KERNEL); if (!vc->vc_screenbuf) goto err_free; @@ -1128,7 +1128,7 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc, if (new_screen_size > (4 << 20)) return -EINVAL; - newscreen = kmalloc(new_screen_size, GFP_USER); + newscreen = kzalloc(new_screen_size, GFP_USER); if (!newscreen) return -ENOMEM; |