Merged.
Maxim.

On 02/26/2015 11:53 PM, Bill Fischofer wrote:
For this series:

Reviewed-by: Bill Fischofer <[email protected] <mailto:[email protected]>>

On Thu, Feb 26, 2015 at 12:56 PM, Mike Holmes <[email protected] <mailto:[email protected]>> wrote:

    Signed-off-by: Mike Holmes <[email protected]
    <mailto:[email protected]>>
    ---
     include/odp/api/config.h                   | 6 ++++++
     platform/linux-generic/odp_shared_memory.c | 5 +----
     2 files changed, 7 insertions(+), 4 deletions(-)

    diff --git a/include/odp/api/config.h b/include/odp/api/config.h
    index 8f1139d..8989fed 100644
    --- a/include/odp/api/config.h
    +++ b/include/odp/api/config.h
    @@ -121,6 +121,12 @@ extern "C" {
      */
     #define ODP_CONFIG_PACKET_BUF_LEN_MAX
    (ODP_CONFIG_PACKET_SEG_LEN_MIN*6)

    +/** Maximum number of shared memory blocks.
    + *
    + * This the the number of separate SHM areas that can be reserved
    concurrently
    + */
    +#define ODP_SHM_NUM_BLOCKS 32
    +
     /**
      * @}
      */
    diff --git a/platform/linux-generic/odp_shared_memory.c
    b/platform/linux-generic/odp_shared_memory.c
    index 9f6ce1e..de80140 100644
    --- a/platform/linux-generic/odp_shared_memory.c
    +++ b/platform/linux-generic/odp_shared_memory.c
    @@ -15,6 +15,7 @@
     #include <odp/debug.h>
     #include <odp_debug_internal.h>
     #include <odp_align_internal.h>
    +#include <odp/config.h>

     #include <unistd.h>
     #include <sys/mman.h>
    @@ -26,10 +27,6 @@
     #include <string.h>
     #include <errno.h>

    -
    -#define ODP_SHM_NUM_BLOCKS 32
    -
    -
     typedef struct {
            char      name[ODP_SHM_NAME_LEN];
            uint64_t  size;
    --
    2.1.0


    _______________________________________________
    lng-odp mailing list
    [email protected] <mailto:[email protected]>
    http://lists.linaro.org/mailman/listinfo/lng-odp




_______________________________________________
lng-odp mailing list
[email protected]
http://lists.linaro.org/mailman/listinfo/lng-odp


_______________________________________________
lng-odp mailing list
[email protected]
http://lists.linaro.org/mailman/listinfo/lng-odp

Reply via email to