diff mbox series

[API-NEXT,03/15] merge fix: _ishm

Message ID 20170127142921.29029-4-maxim.uvarov@linaro.org
State New
Headers show
Series Merge tag 'v1.13.0.0' into api-next | expand

Commit Message

Maxim Uvarov Jan. 27, 2017, 2:29 p.m. UTC 
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
 platform/linux-generic/_ishm.c                | 21 ---------------------
 platform/linux-generic/include/odp_internal.h |  6 ------
 2 files changed, 27 deletions(-)

-- 
2.11.0.295.gd7dffce
diff mbox series

Patch

diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c
index 038ba1e6..4c2578b1 100644
--- a/platform/linux-generic/_ishm.c
+++ b/platform/linux-generic/_ishm.c
@@ -52,20 +52,14 @@ 
 #include <odp/api/align.h>
 #include <odp/api/system_info.h>
 #include <odp/api/debug.h>
-<<<<<<< HEAD
 #include <odp/drv/shm.h>
-=======
->>>>>>> v1.13.0.0
 #include <odp_shm_internal.h>
 #include <odp_debug_internal.h>
 #include <odp_align_internal.h>
 #include <_fdserver_internal.h>
 #include <_ishm_internal.h>
 #include <_ishmphy_internal.h>
-<<<<<<< HEAD
 #include <_ishmpool_internal.h>
-=======
->>>>>>> v1.13.0.0
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -88,22 +82,12 @@ 
  * if some of the block ownwers never procsync() after free). This number
  * should take that into account)
  */
-<<<<<<< HEAD
 #define ISHM_MAX_NB_BLOCKS ODPDRV_CONFIG_SHM_BLOCKS
 
 /*
  * Maximum internal shared memory block name length in chars
  */
 #define ISHM_NAME_MAXLEN ODPDRV_SHM_NAME_LEN
-=======
-#define ISHM_MAX_NB_BLOCKS 128
-
-/*
- * Maximum internal shared memory block name length in chars
- * probably taking the same number as SHM name size make sense at this stage
- */
-#define ISHM_NAME_MAXLEN 32
->>>>>>> v1.13.0.0
 
 /*
  * Linux underlying file name: <directory>/odp-<odp_pid>-ishm-<name>
@@ -1458,7 +1442,6 @@  int _odp_ishm_init_global(void)
 	 * is performed for the main thread... Many init_global() functions
 	 * indeed assume the availability of odp_shm_reserve()...:
 	 */
-<<<<<<< HEAD
 	if (do_odp_ishm_init_local()) {
 		ODP_ERR("unable to init the main thread\n.");
 		goto init_glob_err4;
@@ -1472,10 +1455,6 @@  int _odp_ishm_init_global(void)
 init_glob_err4:
 	if (_odp_ishmphy_unbook_va())
 		ODP_ERR("unable to unbook virtual space\n.");
-=======
-	return do_odp_ishm_init_local();
-
->>>>>>> v1.13.0.0
 init_glob_err3:
 	if (munmap(ishm_ftbl, sizeof(ishm_ftable_t)) < 0)
 		ODP_ERR("unable to munmap main fragment table\n.");
diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h
index 7abfd862..05c8a422 100644
--- a/platform/linux-generic/include/odp_internal.h
+++ b/platform/linux-generic/include/odp_internal.h
@@ -51,10 +51,7 @@  struct odp_global_data_s {
 	odp_cpumask_t control_cpus;
 	odp_cpumask_t worker_cpus;
 	int num_cpus_installed;
-<<<<<<< HEAD
 	config_t configuration;
-=======
->>>>>>> v1.13.0.0
 };
 
 enum init_stage {
@@ -133,11 +130,8 @@  int _odp_ishm_init_local(void);
 int _odp_ishm_term_global(void);
 int _odp_ishm_term_local(void);
 
-<<<<<<< HEAD
 int _odp_modules_init_global(void);
 
-=======
->>>>>>> v1.13.0.0
 int cpuinfo_parser(FILE *file, system_info_t *sysinfo);
 uint64_t odp_cpu_hz_current(int id);