From: Jesper Juhl Date: Sun, 24 Jul 2011 21:15:42 +0000 (+0200) Subject: trace events: Update version number reference to new 3.x scheme for EVENT_POWER_TRACI... X-Git-Tag: Ubuntu-5.2.0-15.16~19860^2~6 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f629299b544b6cc12b4e3e85fec96f4ce5809482;p=mirror_ubuntu-eoan-kernel.git trace events: Update version number reference to new 3.x scheme for EVENT_POWER_TRACING_DEPRECATED What was scheduled to be 2.6.41 is now going to be 3.1 . Signed-off-by: Jesper Juhl Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Steven Rostedt Link: http://lkml.kernel.org/r/alpine.LNX.2.00.1107250929370.8080@swampdragon.chaosbits.net Signed-off-by: Ingo Molnar --- diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 2ad39e556cb4..cd3134510f3d 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -82,7 +82,7 @@ config EVENT_POWER_TRACING_DEPRECATED power:power_frequency This is for userspace compatibility and will vanish after 5 kernel iterations, - namely 2.6.41. + namely 3.1. config CONTEXT_SWITCH_TRACER bool