[API-NEXT,04/15] merge fix: odp_config_internal.h

Message ID 20170127142921.29029-5-maxim.uvarov@linaro.org
State New
Headers show
Series
  • Merge tag 'v1.13.0.0' into api-next
Related show

Commit Message

Maxim Uvarov Jan. 27, 2017, 2:29 p.m.
---
 .../linux-generic/include/odp_config_internal.h    | 66 ++++++----------------
 1 file changed, 16 insertions(+), 50 deletions(-)

-- 
2.11.0.295.gd7dffce

Patch

diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h
index 64996f85..dadd59e7 100644
--- a/platform/linux-generic/include/odp_config_internal.h
+++ b/platform/linux-generic/include/odp_config_internal.h
@@ -76,7 +76,6 @@  extern "C" {
  * Maximum number of segments per packet
  */
 #define CONFIG_PACKET_MAX_SEGS 6
-<<<<<<< HEAD
 
 /*
  * Maximum packet segment size including head- and tailrooms
@@ -91,41 +90,6 @@  extern "C" {
 #define CONFIG_PACKET_MAX_SEG_LEN  (CONFIG_PACKET_SEG_SIZE - \
 				    CONFIG_PACKET_HEADROOM - \
 				    CONFIG_PACKET_TAILROOM)
-=======
->>>>>>> v1.13.0.0
-
-/*
- * Maximum packet segment size including head- and tailrooms
- */
-<<<<<<< HEAD
-#define CONFIG_PACKET_SEG_LEN_MIN CONFIG_PACKET_MAX_SEG_LEN
-
-/* Maximum number of shared memory blocks.
- *
- * This the the number of separate SHM areas that can be reserved concurrently
- */
-#define ODP_CONFIG_SHM_BLOCKS (ODP_CONFIG_POOLS + 48)
-
-/*
- * Size of the virtual address space pre-reserver for ISHM
- *
- * This is just virtual space preallocation size, not memory allocation.
- * This address space is used by ISHM to map things at a common address in
- * all ODP threads (when the _ODP_ISHM_SINGLE_VA flag is used).
- * In bytes.
- */
-#define ODP_CONFIG_ISHM_VA_PREALLOC_SZ (536870912L)
-=======
-#define CONFIG_PACKET_SEG_SIZE (8 * 1024)
-
-/* Maximum data length in a segment
- *
- * The user defined segment length (seg_len in odp_pool_param_t) must not
- * be larger than this.
-*/
-#define CONFIG_PACKET_MAX_SEG_LEN  (CONFIG_PACKET_SEG_SIZE - \
-				    CONFIG_PACKET_HEADROOM - \
-				    CONFIG_PACKET_TAILROOM)
 
 /*
  * Minimum packet segment length
@@ -135,7 +99,22 @@  extern "C" {
  * this value.
  */
 #define CONFIG_PACKET_SEG_LEN_MIN CONFIG_PACKET_MAX_SEG_LEN
->>>>>>> v1.13.0.0
+
+/* Maximum number of shared memory blocks.
+ *
+ * This the the number of separate SHM areas that can be reserved concurrently
+ */
+#define ODP_CONFIG_SHM_BLOCKS (ODP_CONFIG_POOLS + 48)
+
+/*
+ * Size of the virtual address space pre-reserver for ISHM
+ *
+ * This is just virtual space preallocation size, not memory allocation.
+ * This address space is used by ISHM to map things at a common address in
+ * all ODP threads (when the _ODP_ISHM_SINGLE_VA flag is used).
+ * In bytes.
+ */
+#define ODP_CONFIG_ISHM_VA_PREALLOC_SZ (536870912L)
 
 /* Maximum number of shared memory blocks available on the driver interface.
  *
@@ -160,19 +139,6 @@  extern "C" {
  */
 #define CONFIG_POOL_CACHE_SIZE 256
 
-<<<<<<< HEAD
-=======
-/*
- * Size of the virtual address space pre-reserver for ISHM
- *
- * This is just virtual space preallocation size, not memory allocation.
- * This address space is used by ISHM to map things at a common address in
- * all ODP threads (when the _ODP_ISHM_SINGLE_VA flag is used).
- * In bytes.
- */
-#define ODP_CONFIG_ISHM_VA_PREALLOC_SZ (536870912L)
-
->>>>>>> v1.13.0.0
 #ifdef __cplusplus
 }
 #endif