CaROS/meta-intel
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel synced 2026-01-01 13:58:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

meta-isg: qat: fix strict_str* compile errors

Browse Source 
Defines strict_str* have become obsolete and removed entirely
starting from kernel v3.18. This results in errors like:

     error: implicit declaration of function 'strict_strtoull'
            [-Werror=implicit-function-declaration]

Replace strict_strtoull with kstrtoull to ensure qat 2.3.0-34
compiles.

Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
Anuj Mittal 2015-09-18 15:40:06 +08:00 committed by Saul Wold
parent 1201a576c9
commit 88a5f5857d
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch Normal file
View File

@ -0,0 +1,40 @@
From 4ef0e0124f73b3bc24b2f2a772d83176aaa9fb3f Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anujx.mittal@intel.com>
Date: Tue, 8 Sep 2015 11:53:36 +0800
Subject: [PATCH] qat: replace strict_strtoull with kstrtoull
Upstream-Status: Backport
strict_strtoull() has been removed starting kernel v3.18.
Hence, replace the usage with kstrtoull().
Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
---
.../uclo/include/linux/uclo_platform.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/quickassist/utilities/downloader/Target_CoreLibs/uclo/include/linux/uclo_platform.h b/quickassist/utilities/downloader/Target_CoreLibs/uclo/include/linux/uclo_platform.h
index a4bf903..ee3e2d8 100755
--- a/quickassist/utilities/downloader/Target_CoreLibs/uclo/include/linux/uclo_platform.h
+++ b/quickassist/utilities/downloader/Target_CoreLibs/uclo/include/linux/uclo_platform.h
@@ -116,6 +116,9 @@
/* 32-bit/64-bit 2.6.29 kernel does not export simple_strtoll */
#define STR_TO_32(str, base, num, endPtr) {*(num) = (int)simple_strtol((str), &(endPtr), (base));}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
+#define STR_TO_64(str, base, num, endPtr) {endPtr=NULL; if (kstrtoull((str), (base), (num))) printk("Error strtoull convert %s\n", str); }
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
#define STR_TO_64(str, base, num, endPtr) {endPtr=NULL; if (strict_strtoull((str), (base), (num))) printk("Error strtoull convert %s\n", str); }
#else
@@ -133,6 +136,7 @@
} while(0)
#endif
#endif
+#endif
int aToi(const char *pStr);
--
1.7.9.5

1
meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb
View File

@ -1,6 +1,7 @@
include qat16.inc
SRC_URI += "file://qat16_2.3.0-34-qat-add-install-target-to-makefiles.patch \
file://qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch \
"
SRC_URI[qat.md5sum] = "9614bf598bc8e7eedc8adb6d29109033"