From 6af512a16334d072c5d71a1656c2e6840c9df9af Mon Sep 17 00:00:00 2001 From: Carsten Emde Date: Thu, 11 Mar 2010 00:18:18 +0100 Subject: [PATCH] tracing: Define pid functions for all config combinations commit f6e20d04816d1cbb4000ba68461e39516fdb23e2 in tip. If CONFIG_MISSED_TIMER_OFFSETS_HIST was defined and CONFIG_WAKEUP_LATENCY_HIST was not, the pid-related functions remained undefined. Fix the erroneous #ifdef around the pid-related functions. Signed-off-by: Carsten Emde Signed-off-by: Thomas Gleixner Signed-off-by: Paul Gortmaker --- kernel/trace/latency_hist.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/kernel/trace/latency_hist.c b/kernel/trace/latency_hist.c index ce67060..7c26615 100644 --- a/kernel/trace/latency_hist.c +++ b/kernel/trace/latency_hist.c @@ -401,7 +401,8 @@ latency_hist_reset(struct file *file, const char __user *a, return size; } -#ifdef CONFIG_WAKEUP_LATENCY_HIST +#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \ + defined(CONFIG_MISSED_TIMER_OFFSETS_HIST) static ssize_t show_pid(struct file *file, char __user *ubuf, size_t cnt, loff_t *ppos) { -- 1.7.0.4