]> xenbits.xensource.com Git - unikraft/libs/musl.git/commitdiff
Remove patch for 'ioctl'
authorDragos Iulian Argint <dragosargint21@gmail.com>
Sat, 7 May 2022 09:05:35 +0000 (12:05 +0300)
committerUnikraft <monkey@unikraft.io>
Wed, 23 Nov 2022 10:17:05 +0000 (10:17 +0000)
This patch was introduced to modify the prototype of the
`ioctl()` function when it was exported directly from vfscore.
Now, since we want to keep the wrapper in musl, we leave the
function prototype unchanged. The patch is no longer needed.

Signed-off-by: Dragos Iulian Argint <dragosargint21@gmail.com>
Reviewed-by: Sergiu Moga <sergiu.moga@protonmail.com>
Reviewed-by: Simon Kuenzer <simon@unikraft.io>
Approved-by: Simon Kuenzer <simon@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #5

patches/0008-Use-compatible-ioctl-prototype.patch [deleted file]

diff --git a/patches/0008-Use-compatible-ioctl-prototype.patch b/patches/0008-Use-compatible-ioctl-prototype.patch
deleted file mode 100644 (file)
index 85cd3b0..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 150959f0fd0b04919fb1384abb8998fd8e2c1ca4 Mon Sep 17 00:00:00 2001
-From: Alexander Jung <alexander.jung@neclab.eu>
-Date: Tue, 30 Jun 2020 19:45:36 +0200
-Subject: [PATCH] Use compatible ioctl prototype
-
-This patch updates the `ioctl` prototype with a more precise definition
-which is also compliant with vfscore.
-
-Signed-off-by: Alexander Jung <alexander.jung@neclab.eu>
----
- include/sys/ioctl.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/include/sys/ioctl.h b/include/sys/ioctl.h
-index d0415b3..9929002 100644
---- a/include/sys/ioctl.h
-+++ b/include/sys/ioctl.h
-@@ -6,7 +6,8 @@ extern "C" {
- #include <bits/ioctl.h>
--int ioctl (int, int, ...);
-+// int ioctl (int, int, ...);
-+int ioctl(int fd, unsigned long int request, ...);
- #ifdef __cplusplus
- }
--- 
-2.20.1
-