From f687aa44078577c4be0469b0ef2c19f81790ea01 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Sat, 20 Apr 2013 17:35:50 +0200 Subject: [PATCH] --- yaml --- r: 372932 b: refs/heads/master c: 2c82d1be4d9d70b5e3da6e179bb033bd53e95299 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/trace/events/timer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fbdcbef962a2..b10496c90a53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 447a34a2b77da949ea0870c2bef9b501d2d4c4ab +refs/heads/master: 2c82d1be4d9d70b5e3da6e179bb033bd53e95299 diff --git a/trunk/include/trace/events/timer.h b/trunk/include/trace/events/timer.h index f5eb53eb658f..e967dd8a34c6 100644 --- a/trunk/include/trace/events/timer.h +++ b/trunk/include/trace/events/timer.h @@ -323,7 +323,7 @@ TRACE_EVENT(itimer_expire, (int) __entry->pid, (unsigned long long)__entry->now) ); -#ifdef CONFIG_NO_HZ_FULL +#ifdef CONFIG_NO_HZ_COMMON TRACE_EVENT(tick_stop, TP_PROTO(int success, char *error_msg),