eal: use sizeof to avoid a double use of a define

[dpdk.git] / lib / librte_eal / bsdapp / eal / eal_hugepage_info.c

diff --git a/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c b/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
index dae3c8b..8a33c30 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -70,7 +70,8 @@ int
 eal_hugepage_info_init(void)
 {
        size_t sysctl_size;
-       int buffer_size, num_buffers, fd, error;
+       int num_buffers, fd, error;
+       int64_t buffer_size;
        /* re-use the linux "internal config" structure for our memory data */
        struct hugepage_info *hpi = &internal_config.hugepage_info[0];
        struct hugepage_info *tmp_hpi;
@@ -101,20 +102,20 @@ eal_hugepage_info_init(void)
 
        if (buffer_size >= 1<<30)
                RTE_LOG(INFO, EAL, "Contigmem driver has %d buffers, each of size %dGB\n",
-                               num_buffers, buffer_size>>30);
+                               num_buffers, (int)(buffer_size>>30));
        else if (buffer_size >= 1<<20)
                RTE_LOG(INFO, EAL, "Contigmem driver has %d buffers, each of size %dMB\n",
-                               num_buffers, buffer_size>>20);
+                               num_buffers, (int)(buffer_size>>20));
        else
                RTE_LOG(INFO, EAL, "Contigmem driver has %d buffers, each of size %dKB\n",
-                               num_buffers, buffer_size>>10);
+                               num_buffers, (int)(buffer_size>>10));
 
        internal_config.num_hugepage_sizes = 1;
        hpi->hugedir = CONTIGMEM_DEV;
        hpi->hugepage_sz = buffer_size;
        hpi->num_pages[0] = num_buffers;
        hpi->lock_descriptor = fd;
-       
+
        tmp_hpi = create_shared_memory(eal_hugepage_info_path(),
                                        sizeof(struct hugepage_info));
        if (tmp_hpi == NULL ) {
@@ -128,6 +129,6 @@ eal_hugepage_info_init(void)
                RTE_LOG(ERR, EAL, "Failed to unmap shared memory!\n");
                return -1;
        }
-       
+
        return 0;
 }