This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, api-next has been updated via a7b46491ca049998dc38b0a5b29213a407931523 (commit) via 4f2ebb270c30a46c97355da84587a2220281798c (commit) via 1f2bfb175ea39f6a358bb40d92efd21f709f1dd8 (commit) via 62f4a34301f57a39e4bdacab4b45f29596b76ede (commit) via dccf4d8fcba4f912d4844b6d4a30f045b1e12651 (commit) from bea7fcae31d525e7f1e991f301c807cf86095aef (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit a7b46491ca049998dc38b0a5b29213a407931523 Merge: bea7fcae 4f2ebb27 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Wed Dec 27 17:14:02 2017 +0300
Merge branch 'master' into api-next
diff --cc platform/linux-generic/Makefile.am index 4371e7a9,8152ea18..9f7993d8 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -162,12 -150,8 +164,11 @@@ noinst_HEADERS = include/odp_ring_internal.h \ include/odp_queue_if.h \ include/odp_schedule_if.h \ + include/odp_schedule_scalable.h \ + include/odp_schedule_scalable_config.h \ + include/odp_schedule_scalable_ordered.h \ include/odp_sorted_list_internal.h \ include/odp_shm_internal.h \ - include/odp_time_internal.h \ include/odp_timer_internal.h \ include/odp_timer_wheel_internal.h \ include/odp_traffic_mngr_internal.h \ @@@ -255,36 -228,21 +255,33 @@@ __LIB__libodp_linux_la_SOURCES += arch/ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c arch_odp_headers = arch/arm/odp/api/cpu_arch.h +noinst_HEADERS += arch/arm/odp_atomic.h \ + arch/arm/odp_cpu.h \ + arch/arm/odp_cpu_idling.h \ + arch/default/odp_cpu_idling.h \ + arch/arm/odp_llsc.h endif if ARCH_IS_AARCH64 - __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ - arch/default/odp_cpu_cycles.c \ + __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/aarch64/odp_global_time.c \ arch/default/odp_sysinfo_parse.c arch_odp_headers = arch/aarch64/odp/api/cpu_arch.h +noinst_HEADERS += arch/aarch64/odp_atomic.h \ + arch/aarch64/odp_cpu.h \ + arch/aarch64/odp_cpu_idling.h \ + arch/default/odp_cpu_idling.h \ + arch/aarch64/odp_llsc.h endif if ARCH_IS_MIPS64 - __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_arch.c \ - arch/default/odp_cpu_cycles.c \ + __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/mips64/odp_sysinfo_parse.c arch_odp_headers = arch/mips64/odp/api/cpu_arch.h +noinst_HEADERS += arch/default/odp_cpu.h \ + arch/default/odp_cpu_idling.h endif if ARCH_IS_POWERPC - __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ - arch/default/odp_cpu_cycles.c \ + __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/powerpc/odp_sysinfo_parse.c arch_odp_headers = arch/powerpc/odp/api/cpu_arch.h diff --cc platform/linux-generic/odp_timer.c index bee63383,70a9c97b..c52cf717 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@@ -54,7 -54,6 +54,7 @@@ #include <odp/api/sync.h> #include <odp/api/time.h> #include <odp/api/timer.h> - #include <odp_time_internal.h> ++#include <odp_arch_time_internal.h> #include <odp_timer_internal.h>
#define TMO_UNUSED ((uint64_t)0xFFFFFFFFFFFFFFFF)
-----------------------------------------------------------------------
Summary of changes: platform/linux-generic/Makefile.am | 18 ++++------ platform/linux-generic/_ishm.c | 21 +++++------ .../linux-generic/arch/aarch64/odp_global_time.c | 2 +- platform/linux-generic/arch/default/odp_cpu_arch.c | 38 -------------------- .../linux-generic/arch/default/odp_cpu_cycles.c | 29 +++++++++++++++ .../linux-generic/arch/default/odp_global_time.c | 13 +------ .../mips64/{odp_cpu_arch.c => odp_cpu_cycles.c} | 11 +++++- .../odp_arch_time_internal.h} | 4 +-- platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 41 ---------------------- .../linux-generic/arch/powerpc/odp_global_time.c | 15 -------- platform/linux-generic/arch/x86/cpu_flags.c | 2 +- .../arch/x86/{odp_cpu_arch.c => odp_cpu_cycles.c} | 17 +++++---- platform/linux-generic/arch/x86/odp_global_time.c | 2 +- platform/linux-generic/odp_time.c | 2 +- platform/linux-generic/odp_timer.c | 2 +- 15 files changed, 75 insertions(+), 142 deletions(-) delete mode 100644 platform/linux-generic/arch/default/odp_cpu_arch.c rename platform/linux-generic/arch/mips64/{odp_cpu_arch.c => odp_cpu_cycles.c} (79%) rename platform/linux-generic/{include/odp_time_internal.h => arch/odp_arch_time_internal.h} (82%) delete mode 100644 platform/linux-generic/arch/powerpc/odp_cpu_arch.c delete mode 100644 platform/linux-generic/arch/powerpc/odp_global_time.c rename platform/linux-generic/arch/x86/{odp_cpu_arch.c => odp_cpu_cycles.c} (77%)
hooks/post-receive