diff options
author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-06-15 20:29:06 +0200 |
---|---|---|
committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-06-15 20:37:12 +0200 |
commit | 199e427d5dea3051eec1726eb9c857aa3d5fdde2 (patch) | |
tree | 5477b3bd4868676a210bbd3ef67a469d34814e61 /debian/patches/ubuntu-fix-xenvirt-support-dynamic-page-size.patch | |
parent | b5cdd645c9fc62341d55aebbfc93a1b648415512 (diff) |
Merge Ubuntu DPDK packaging as of 15th June 2016
As discussed this shall be our initial baseline.
If history is needed for any sort of debugging or analysis it can be
found at https://code.launchpad.net/~ubuntu-server/dpdk/+git/dpdk
Change-Id: Ie95c7effbbea34d723df14f6451c1f782000cbc1
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Diffstat (limited to 'debian/patches/ubuntu-fix-xenvirt-support-dynamic-page-size.patch')
-rw-r--r-- | debian/patches/ubuntu-fix-xenvirt-support-dynamic-page-size.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/ubuntu-fix-xenvirt-support-dynamic-page-size.patch b/debian/patches/ubuntu-fix-xenvirt-support-dynamic-page-size.patch new file mode 100644 index 00000000..ed6fb5d0 --- /dev/null +++ b/debian/patches/ubuntu-fix-xenvirt-support-dynamic-page-size.patch @@ -0,0 +1,32 @@ +Author: Ricardo Salveti <ricardo.salveti@linaro.org> +Last-Update: 2016-04-17 +Fowarded: yes +Description: xenvirt: support dynamic page size + +Fix build failure since PAGE_SIZE is not defined on ARM (multiple values +are possible, so it needs to dynamically get the page size used). + +http://dpdk.org/ml/archives/dev/2016-April/037586.html + +Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org> +--- + drivers/net/xenvirt/rte_eth_xenvirt.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/net/xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c +index b9638d9..afc0193 100644 +--- a/drivers/net/xenvirt/rte_eth_xenvirt.c ++++ b/drivers/net/xenvirt/rte_eth_xenvirt.c +@@ -39,6 +39,9 @@ + #include <sys/mman.h> + #include <errno.h> + #include <sys/user.h> ++#ifndef PAGE_SIZE ++#define PAGE_SIZE sysconf(_SC_PAGE_SIZE) ++#endif + #include <linux/binfmts.h> + #include <xen/xen-compat.h> + #if __XEN_LATEST_INTERFACE_VERSION__ < 0x00040200 +-- +2.7.4 + |