summaryrefslogtreecommitdiff
path: root/tools/perf/util/trace-event-scripting.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2010-10-15 12:03:22 -0700
committerColin Cross <ccross@android.com>2010-10-15 12:03:22 -0700
commit89c37cce1c850fe046df50ccb923a8eccbf259b6 (patch)
tree214c7beca34ca9fd72493001121599291ea1300d /tools/perf/util/trace-event-scripting.c
parent43ca7cdda2e511be7d19c3bdbc437e471b7e8f7e (diff)
parentcd07202cc8262e1669edff0d97715f3dd9260917 (diff)
Merge commit 'v2.6.36-rc8' into linux-tegra-2.6.36
Diffstat (limited to 'tools/perf/util/trace-event-scripting.c')
-rw-r--r--tools/perf/util/trace-event-scripting.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c
index 7ea983acfaea..f7af2fca965d 100644
--- a/tools/perf/util/trace-event-scripting.c
+++ b/tools/perf/util/trace-event-scripting.c
@@ -97,7 +97,7 @@ void setup_python_scripting(void)
register_python_scripting(&python_scripting_unsupported_ops);
}
#else
-struct scripting_ops python_scripting_ops;
+extern struct scripting_ops python_scripting_ops;
void setup_python_scripting(void)
{
@@ -158,7 +158,7 @@ void setup_perl_scripting(void)
register_perl_scripting(&perl_scripting_unsupported_ops);
}
#else
-struct scripting_ops perl_scripting_ops;
+extern struct scripting_ops perl_scripting_ops;
void setup_perl_scripting(void)
{