diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-21 12:43:28 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-21 12:43:28 -0400 |
| commit | 55c484494127ef1efe934a0a08518eec9705c18f (patch) | |
| tree | ebb1a39beccc567b10fcd976146b3723ff5d4f25 | |
| parent | baaf119db5303812a59da9056a3a0857f02bd33b (diff) | |
| download | longterm-queue-5.2-55c484494127ef1efe934a0a08518eec9705c18f.tar.gz | |
virtio: balloon: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/virtio_balloon-fix-up-endian-ness-for-free-cmd-id.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/queue/virtio_balloon-fix-up-endian-ness-for-free-cmd-id.patch b/queue/virtio_balloon-fix-up-endian-ness-for-free-cmd-id.patch index e3775645..6bf9ed7c 100644 --- a/queue/virtio_balloon-fix-up-endian-ness-for-free-cmd-id.patch +++ b/queue/virtio_balloon-fix-up-endian-ness-for-free-cmd-id.patch @@ -1,4 +1,4 @@ -From 168c358af2f8c5a37f8b5f877ba2cc93995606ee Mon Sep 17 00:00:00 2001 +From 691d9a1d70e068077bcb8431da1308fa458ffd65 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" <mst@redhat.com> Date: Mon, 27 Jul 2020 12:01:27 -0400 Subject: [PATCH] virtio_balloon: fix up endian-ness for free cmd id @@ -16,17 +16,17 @@ Reviewed-by: Wei Wang <wei.w.wang@intel.com> Acked-by: David Hildenbrand <david@redhat.com> diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c -index d0fd8f8dc6ed..8be02f333b7a 100644 +index f9aed4e41700..d3e0c2182111 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c -@@ -578,10 +578,14 @@ static int init_vqs(struct virtio_balloon *vb) +@@ -528,10 +528,14 @@ static int init_vqs(struct virtio_balloon *vb) static u32 virtio_balloon_cmd_id_received(struct virtio_balloon *vb) { if (test_and_clear_bit(VIRTIO_BALLOON_CONFIG_READ_CMD_ID, - &vb->config_read_bitmap)) + &vb->config_read_bitmap)) { virtio_cread(vb->vdev, struct virtio_balloon_config, - free_page_hint_cmd_id, + free_page_report_cmd_id, &vb->cmd_id_received_cache); + /* Legacy balloon config space is LE, unlike all other devices. */ + if (!virtio_has_feature(vb->vdev, VIRTIO_F_VERSION_1)) |