Commit 35dce1a9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tracing/core' of... 

Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing

 into tracing/core

Conflicts:
	include/linux/tracepoint.h

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 7cb2e3ee 1c569f02

arch/s390/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ config S390 
	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FTRACE_SYSCALLS

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_DEFAULT_NO_SPIN_MUTEXES

arch/s390/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y

CONFIG_HAVE_FTRACE_SYSCALLS=y

CONFIG_HAVE_SYSCALL_TRACEPOINTS=y

CONFIG_TRACING_SUPPORT=y

CONFIG_FTRACE=y

# CONFIG_FUNCTION_TRACER is not set

arch/s390/include/asm/thread_info.h

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static inline struct thread_info *current_thread_info(void) 
#define TIF_SYSCALL_TRACE	8	/* syscall trace active */

#define TIF_SYSCALL_AUDIT	9	/* syscall auditing active */

#define TIF_SECCOMP		10	/* secure computing */

#define TIF_SYSCALL_FTRACE	11	/* ftrace syscall instrumentation */

#define TIF_SYSCALL_TRACEPOINT	11	/* syscall tracepoint instrumentation */

#define TIF_USEDFPU		16	/* FPU was used by this task this quantum (SMP) */

#define TIF_POLLING_NRFLAG	17	/* true if poll_idle() is polling 

					   TIF_NEED_RESCHED */
@@ -111,7 +111,7 @@ static inline struct thread_info *current_thread_info(void) 
#define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)

#define _TIF_SYSCALL_AUDIT	(1<<TIF_SYSCALL_AUDIT)

#define _TIF_SECCOMP		(1<<TIF_SECCOMP)

#define _TIF_SYSCALL_FTRACE	(1<<TIF_SYSCALL_FTRACE)

#define _TIF_SYSCALL_TRACEPOINT	(1<<TIF_SYSCALL_TRACEPOINT)

#define _TIF_USEDFPU		(1<<TIF_USEDFPU)

#define _TIF_POLLING_NRFLAG	(1<<TIF_POLLING_NRFLAG)

#define _TIF_31BIT		(1<<TIF_31BIT)

arch/s390/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ 
_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \

		 _TIF_MCCK_PENDING)

_TIF_SYSCALL = (_TIF_SYSCALL_TRACE>>8 | _TIF_SYSCALL_AUDIT>>8 | \

		_TIF_SECCOMP>>8 | _TIF_SYSCALL_FTRACE>>8)

		_TIF_SECCOMP>>8 | _TIF_SYSCALL_TRACEPOINT>>8)



STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER

STACK_SIZE  = 1 << STACK_SHIFT

arch/s390/kernel/entry64.S

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ 
_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \

		 _TIF_MCCK_PENDING)

_TIF_SYSCALL = (_TIF_SYSCALL_TRACE>>8 | _TIF_SYSCALL_AUDIT>>8 | \

		_TIF_SECCOMP>>8 | _TIF_SYSCALL_FTRACE>>8)

		_TIF_SECCOMP>>8 | _TIF_SYSCALL_TRACEPOINT>>8)



#define BASED(name) name-system_call(%r13)