From 5bb66add46b24f42cf210af32509f90f509fa05e Mon Sep 17 00:00:00 2001
From: Andrey Kuzmin <andrey.v.kuzmin@gmail.com>
Date: Tue, 16 Feb 2016 10:46:37 -0700
Subject: [PATCH] Include rte_config.h before other DPDK headers

Building the tip of the spdk master against the dpdk-2.2.0 fails with
inappropriate RTE_CACHE_LINE_SIZE error. The simple reversal of the RTE
include file order below fixed it for me.

Change-Id: I8782b7ee21d7f185e6e678f874fbdab9403117a5
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
---
 lib/ioat/ioat_impl.h | 2 +-
 lib/nvme/nvme_impl.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ioat/ioat_impl.h b/lib/ioat/ioat_impl.h
index 84fc66a0c..d7b41a9f3 100644
--- a/lib/ioat/ioat_impl.h
+++ b/lib/ioat/ioat_impl.h
@@ -5,8 +5,8 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <stdbool.h>
-#include <rte_malloc.h>
 #include <rte_config.h>
+#include <rte_malloc.h>
 #include <rte_atomic.h>
 #include <rte_cycles.h>
 
diff --git a/lib/nvme/nvme_impl.h b/lib/nvme/nvme_impl.h
index 2b178cff3..1b682b367 100644
--- a/lib/nvme/nvme_impl.h
+++ b/lib/nvme/nvme_impl.h
@@ -38,8 +38,8 @@
 #include "spdk/pci.h"
 #include "spdk/nvme_spec.h"
 #include <assert.h>
-#include <rte_malloc.h>
 #include <rte_config.h>
+#include <rte_malloc.h>
 #include <rte_mempool.h>
 #include <rte_memcpy.h>