Merge branch 'master' into profiling

ze/Makefile

@@ -23,7 +23,7 @@ ZE_BINDINGS = ze_bindings.rb ze_refinements.rb
 
 all: tracer_ze.so ze_library.rb babeltrace_ze_lib.rb $(ZE_BINDINGS)
 
-LTTNG_FLAGS=-fPIC -g -Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Werror -O3 -I./ -I./include/core -I./include/tools -I../utils/
+LTTNG_FLAGS=-fPIC -g -Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Wno-nonnull -Werror -O3 -I./ -I./include/core -I./include/tools -I../utils/
 
 modified_include: include headers.patch
 	cp -r include/ modified_include/

ze/tracer_ze_helpers.include.c

@@ -299,6 +299,11 @@ static void _load_tracer(void) {
     exit(1);
   }
 
+  find_ze_symbols(handle);
+
+  //FIX for intel tracing layer that needs to register its callbacks first...
+  ZE_INIT_PTR(ZE_INIT_FLAG_NONE);
+
   char *s = NULL;
   s = getenv("LTTNG_UST_ZE_PROFILE");
   if (s)
@@ -306,8 +311,6 @@ static void _load_tracer(void) {
 
   if (_do_profile)
     atexit(&_lib_cleanup);
-
-  find_ze_symbols(handle);
 }
 
 static inline void _init_tracer(void) {