mirror of
https://github.com/linuxkit/linuxkit.git
synced 2026-01-04 21:21:57 +00:00
81b86d111a
The vsock patches were merged into mainline in v4.8-rc1, replace the patches based on the email posting with cherry-picks. The patches appear identical so the only change here is to the annotation of the origin which now references an upstream commit instead of a message-id. Add one new upstream patch b226acab2f6a "VSOCK: Use kvfree()" Signed-off-by: Ian Campbell <ian.campbell@docker.com>
34 lines
896 B
Diff
34 lines
896 B
Diff
From d722f0d8acd78f91e079f2fe0b4e4a29b42435b7 Mon Sep 17 00:00:00 2001
|
|
From: Wei Yongjun <weiyj.lk@gmail.com>
|
|
Date: Tue, 2 Aug 2016 13:50:42 +0000
|
|
Subject: [PATCH 11/46] VSOCK: Use kvfree()
|
|
|
|
Use kvfree() instead of open-coding it.
|
|
|
|
Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit b226acab2f6aaa45c2af27279b63f622b23a44bd)
|
|
---
|
|
drivers/vhost/vsock.c | 5 +----
|
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
|
|
index 028ca16..0ddf3a2 100644
|
|
--- a/drivers/vhost/vsock.c
|
|
+++ b/drivers/vhost/vsock.c
|
|
@@ -434,10 +434,7 @@ err:
|
|
|
|
static void vhost_vsock_free(struct vhost_vsock *vsock)
|
|
{
|
|
- if (is_vmalloc_addr(vsock))
|
|
- vfree(vsock);
|
|
- else
|
|
- kfree(vsock);
|
|
+ kvfree(vsock);
|
|
}
|
|
|
|
static int vhost_vsock_dev_open(struct inode *inode, struct file *file)
|
|
--
|
|
2.9.3
|
|
|