projects/linux·commit d3cbb9af

Merge tag 'tty-7.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

d3cbb9af · Linus Torvalds <[email protected]> · 2026-09-06 09:55:20 -07:00

Pull virtio console fix from Greg KH:
 "Here is a single virtio console fix for 7.3-rc2 to fix a much reported
  regression in 7.3-rc1, sorry about that. It's not been in linux-next,
  but it has been sent by many different developers to resolve the issue
  and is 'obviously' correct"

* tag 'tty-7.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  virtio_console: allocate the port_buffer with the caller's gfp
Commit
d3cbb9af7242873aae6fc2b7e8a991101a322201
Parents
bf979ab8 · b144dc5a

Merge commit. Changes below are compared with the first parent: bf979ab8.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/char/virtio_console.cmodified+1−1View file

drivers/char/virtio_console.c

View file
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 62eecfa..7f6cbe8 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -426,7 +426,7 @@ static struct port_buffer *alloc_buf(struct virtio_device *vdev, size_t buf_size
* Allocate buffer and the sg list. The sg list array is allocated
* directly after the port_buffer struct.
*/
- buf = kmalloc_flex(*buf, sg, pages);
+ buf = kmalloc_flex(*buf, sg, pages, gfp);
if (!buf)
goto fail;