diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-09-06 09:55:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-09-06 09:55:20 -0700 |
| commit | d3cbb9af7242873aae6fc2b7e8a991101a322201 (patch) | |
| tree | 947f33c9c3fd023b18262409bff4e832782a1f82 | |
| parent | bf979ab8f24657ebc6193183cfef1669029e84a5 (diff) | |
| parent | b144dc5a24149ba9a0cb2197001973a74b8c93b2 (diff) | |
| download | linux-2.6-d3cbb9af7242873aae6fc2b7e8a991101a322201.tar.gz linux-2.6-d3cbb9af7242873aae6fc2b7e8a991101a322201.zip | |
Merge tag 'tty-7.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
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
| -rw-r--r-- | drivers/char/virtio_console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 62eecfa61646..7f6cbe851d1e 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; |