From: Jincheng Miao <jmiao@redhat.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 2/4] igb_uio: replace strict_strtoul with kstrtoul
Date: Wed, 10 Dec 2014 11:33:01 +0800 [thread overview]
Message-ID: <1418182383-5744-3-git-send-email-jmiao@redhat.com> (raw)
In-Reply-To: <1418182383-5744-1-git-send-email-jmiao@redhat.com>
>From upstream kernel commit 3db2e9cd, strict_strto* serial functions
are removed. So that we should directly used kstrtoul instead.
Kstrtoul exists from RHEL6.4, so for compatible with old kernel and RHEL,
add some logic to igb_uio/compat.h, same as what we do for pci_num_vf().
Signed-off-by: Jincheng Miao <jmiao@redhat.com>
---
lib/librte_eal/linuxapp/igb_uio/compat.h | 8 ++++++++
lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/linuxapp/igb_uio/compat.h b/lib/librte_eal/linuxapp/igb_uio/compat.h
index a36f034..214d5de 100644
--- a/lib/librte_eal/linuxapp/igb_uio/compat.h
+++ b/lib/librte_eal/linuxapp/igb_uio/compat.h
@@ -44,6 +44,14 @@ static int pci_num_vf(struct pci_dev *dev)
#endif /* < 2.6.34 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && \
+ (!(defined(RHEL_RELEASE_CODE) && \
+ RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6, 4)))
+
+#define kstrtoul strict_strtoul
+
+#endif /* < 2.6.39 */
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && \
(!(defined(RHEL_RELEASE_CODE) && \
RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6, 3)))
diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
index d1ca26e..47ff2f3 100644
--- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
+++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
@@ -83,7 +83,7 @@ store_max_vfs(struct device *dev, struct device_attribute *attr,
unsigned long max_vfs;
struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
- if (0 != strict_strtoul(buf, 0, &max_vfs))
+ if (0 != kstrtoul(buf, 0, &max_vfs))
return -EINVAL;
if (0 == max_vfs)
@@ -174,7 +174,7 @@ store_max_read_request_size(struct device *dev,
unsigned long size = 0;
int ret;
- if (strict_strtoul(buf, 0, &size) != 0)
+ if (0 != kstrtoul(buf, 0, &size))
return -EINVAL;
ret = pcie_set_readrq(pci_dev, (int)size);
--
1.7.1
next prev parent reply other threads:[~2014-12-10 3:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-10 3:32 [dpdk-dev] [PATCH 0/4] compatibility fallback and replacement of kernel function invoking Jincheng Miao
2014-12-10 3:33 ` [dpdk-dev] [PATCH 1/4] igb_uio: compatible with upstream longterm kernel and RHEL Jincheng Miao
2014-12-10 3:33 ` Jincheng Miao [this message]
2014-12-10 3:33 ` [dpdk-dev] [PATCH 3/4] kni: replace strict_strtoul with kstrtoul Jincheng Miao
2014-12-10 8:39 ` Thomas Monjalon
2014-12-10 8:48 ` Jincheng Miao
2014-12-10 9:18 ` Thomas Monjalon
2014-12-10 9:39 ` Jincheng Miao
2014-12-10 3:33 ` [dpdk-dev] [PATCH 4/4] xen_dom0: " Jincheng Miao
2014-12-10 8:39 ` Thomas Monjalon
2014-12-10 3:58 ` [dpdk-dev] [PATCH 0/4] compatibility fallback and replacement of kernel function invoking Zhang, Helin
2014-12-10 4:15 ` Jincheng Miao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1418182383-5744-3-git-send-email-jmiao@redhat.com \
--to=jmiao@redhat.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).