diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 3edb25056e..90e177f3b3 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -43,7 +43,7 @@ #include <getopt.h> #include <rte_common.h> -#include <rte_common_vect.h> +#include <rte_vect.h> #include <rte_byteorder.h> #include <rte_log.h> #include <rte_memory.h> diff --git a/lib/librte_acl/rte_acl_osdep.h b/lib/librte_acl/rte_acl_osdep.h index 6287c846ea..81fdefbf49 100644 --- a/lib/librte_acl/rte_acl_osdep.h +++ b/lib/librte_acl/rte_acl_osdep.h @@ -61,7 +61,7 @@ #define DIM(x) RTE_DIM(x) #include <rte_common.h> -#include <rte_common_vect.h> +#include <rte_vect.h> #include <rte_memory.h> #include <rte_log.h> #include <rte_memcpy.h> diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile index cf961a7748..3ea3bbf9dc 100644 --- a/lib/librte_eal/common/Makefile +++ b/lib/librte_eal/common/Makefile @@ -39,7 +39,6 @@ INC += rte_rwlock.h rte_tailq.h rte_interrupts.h rte_alarm.h INC += rte_string_fns.h rte_version.h INC += rte_eal_memconfig.h rte_malloc_heap.h INC += rte_hexdump.h rte_devargs.h rte_dev.h -INC += rte_common_vect.h INC += rte_pci_dev_feature_defs.h rte_pci_dev_features.h ifeq ($(CONFIG_RTE_INSECURE_FUNCTION_WARNING),y) diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h index 82ea7c3a13..6a5742635b 100644 --- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h +++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h @@ -43,7 +43,7 @@ #include <stdio.h> #include <stdint.h> #include <string.h> -#include <rte_common_vect.h> +#include <rte_vect.h> #ifdef __cplusplus extern "C" { diff --git a/lib/librte_eal/common/include/rte_common_vect.h b/lib/librte_eal/common/include/arch/x86/rte_vect.h similarity index 95% rename from lib/librte_eal/common/include/rte_common_vect.h rename to lib/librte_eal/common/include/arch/x86/rte_vect.h index 54ec70f506..d5bcdb9bbb 100644 --- a/lib/librte_eal/common/include/rte_common_vect.h +++ b/lib/librte_eal/common/include/arch/x86/rte_vect.h @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,8 +31,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _RTE_COMMON_VECT_H_ -#define _RTE_COMMON_VECT_H_ +#ifndef _RTE_VECT_H_ +#define _RTE_VECT_H_ /** * @file @@ -125,4 +125,4 @@ typedef union rte_ymm { } #endif -#endif /* _RTE_COMMON__VECT_H_ */ +#endif /* _RTE_VECT_H_ */ diff --git a/lib/librte_lpm/rte_lpm.h b/lib/librte_lpm/rte_lpm.h index e6c25b648b..e318769661 100644 --- a/lib/librte_lpm/rte_lpm.h +++ b/lib/librte_lpm/rte_lpm.h @@ -46,7 +46,7 @@ #include <rte_branch_prediction.h> #include <rte_memory.h> #include <rte_common.h> -#include <rte_common_vect.h> +#include <rte_vect.h> #ifdef __cplusplus extern "C" {