diff options
| author | Matias Elo <matias.elo@nokia.com> | 2018-10-15 13:45:30 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2018-11-21 18:02:16 +0300 |
| commit | 1ee7da08721452033dd7b0537e62ec1191291120 (patch) | |
| tree | 1ac90887959404000b579ed8ad5b3386df9fafcf | |
| parent | eb9f47e9ce077e089575183abbfe00f2fce2fd41 (diff) | |
linux-gen: shm: remove single_va configuration option
Process mode is now enabled by setting odp_init_global() parameter
odp_init_t.mem_model to ODP_MEM_MODEL_PROCESS.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
| -rw-r--r-- | config/odp-linux-generic.conf | 6 | ||||
| -rw-r--r-- | platform/linux-generic/odp_ishm.c | 7 | ||||
| -rw-r--r-- | platform/linux-generic/test/process-mode.conf | 5 |
3 files changed, 2 insertions, 16 deletions
diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf index 4585a8964..bca123bc3 100644 --- a/config/odp-linux-generic.conf +++ b/config/odp-linux-generic.conf @@ -16,7 +16,7 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.3" +config_file_version = "0.1.4" # Shared memory options shm: { @@ -33,10 +33,6 @@ shm: { # When using process mode threads, this value should be set to 0 # because the current implementation won't work properly otherwise. num_cached_hp = 0 - - # Allocate internal shared memory using a single virtual address space. - # Set to 1 to enable using process mode. - single_va = 0 } # Pool options diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index cf37bd9bc..4a4813973 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -301,15 +301,8 @@ static void hp_init(void) char filename[ISHM_FILENAME_MAXLEN]; char dir[ISHM_FILENAME_MAXLEN]; int count; - int single_va = 0; void *addr; - if (_odp_libconfig_lookup_ext_int("shm", NULL, "single_va", - &single_va)) { - odp_global_ro.shm_single_va = single_va; - ODP_DBG("Shm single VA: %d\n", odp_global_ro.shm_single_va); - } - if (!_odp_libconfig_lookup_ext_int("shm", NULL, "num_cached_hp", &count)) { return; diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf index f631f54bc..4bda69334 100644 --- a/platform/linux-generic/test/process-mode.conf +++ b/platform/linux-generic/test/process-mode.conf @@ -1,10 +1,7 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.3" +config_file_version = "0.1.4" # Shared memory options shm: { - # Override default option and allocate internal shms using single - # virtual address space. - single_va = 1 } |