Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6921a575 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/urgent-2' of... 

Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
parents 9c5da09d 93b3cca1

include/linux/compiler-gcc.h

+3 −3
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ 
 */

#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \

    !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4)

# define inline		inline		__attribute__((always_inline))

# define __inline__	__inline__	__attribute__((always_inline))

# define __inline	__inline	__attribute__((always_inline))

# define inline		inline		__attribute__((always_inline)) notrace

# define __inline__	__inline__	__attribute__((always_inline)) notrace

# define __inline	__inline	__attribute__((always_inline)) notrace

#else

/* A lot of inline functions can cause havoc with function tracing */

# define inline		inline		notrace