From 6eb0919b9026d11155ae9ab3ee29448768f56067 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 3 May 2015 15:01:51 +0200 Subject: [PATCH] cryptodev: get rid of get_unused_fd() The get_unused_fd() macro was removed upstream by https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=f938612dd97d481b8b5bf960c992ae577f081c17 Thus replace get_unused_fd() by get_unused_fd_flags(0) which used to be the definition of the get_unused_fd() macro before it was removed. This fixes cryptodev compilation on kernel 4.0. Signed-off-by: Daniel Golle --- utils/cryptodev-linux/Makefile | 2 +- .../patches/001-no-get-unused-fd.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 utils/cryptodev-linux/patches/001-no-get-unused-fd.patch diff --git a/utils/cryptodev-linux/Makefile b/utils/cryptodev-linux/Makefile index e9af4ca915..507cf4f5f9 100644 --- a/utils/cryptodev-linux/Makefile +++ b/utils/cryptodev-linux/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=cryptodev-linux PKG_VERSION:=1.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.gna.org/cryptodev-linux/ diff --git a/utils/cryptodev-linux/patches/001-no-get-unused-fd.patch b/utils/cryptodev-linux/patches/001-no-get-unused-fd.patch new file mode 100644 index 0000000000..e3308bbe6d --- /dev/null +++ b/utils/cryptodev-linux/patches/001-no-get-unused-fd.patch @@ -0,0 +1,13 @@ +Index: cryptodev-linux-1.7/ioctl.c +=================================================================== +--- cryptodev-linux-1.7.orig/ioctl.c ++++ cryptodev-linux-1.7/ioctl.c +@@ -546,7 +546,7 @@ static int + clonefd(struct file *filp) + { + int ret; +- ret = get_unused_fd(); ++ ret = get_unused_fd_flags(0); + if (ret >= 0) { + get_file(filp); + fd_install(ret, filp);