aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-09 15:40:13 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-09 15:40:13 -0700
commit009da24eaab4b1b2eecfc9dede0806d151b53b36 (patch)
tree130e06fbc4688507529d3541ebbb30ebc44b85f6
parent28d7e9e4fe1c5d48a679f290b3a7d4adb3777f27 (diff)
downloadltsi-kernel-009da24eaab4b1b2eecfc9dede0806d151b53b36.tar.gz
add lttng fixup patch
-rw-r--r--patches.lttng/lttng-fix-module-name-lttng-relay.ko-lttng-tracer.ko.patch55
-rw-r--r--series1
2 files changed, 56 insertions, 0 deletions
diff --git a/patches.lttng/lttng-fix-module-name-lttng-relay.ko-lttng-tracer.ko.patch b/patches.lttng/lttng-fix-module-name-lttng-relay.ko-lttng-tracer.ko.patch
new file mode 100644
index 00000000000000..06be73f13a4988
--- /dev/null
+++ b/patches.lttng/lttng-fix-module-name-lttng-relay.ko-lttng-tracer.ko.patch
@@ -0,0 +1,55 @@
+From ltsi-dev-bounces@lists.linuxfoundation.org Sun Jul 8 18:24:03 2012
+From: UCHINO Satoshi <satoshi.uchino@toshiba.co.jp>
+Date: Mon, 09 Jul 2012 10:23:55 +0900 (東京 (標準時))
+Subject: LTTng: fix module name: lttng-relay.ko => lttng-tracer.ko
+To: ltsi-dev@lists.linuxfoundation.org
+Cc: mathieu.desnoyers@efficios.com
+Message-ID: <20120709.102355.248509328.satoshi.uchino@toshiba.co.jp>
+
+
+It seems lttng-tools 2.0 expects lttng-tracer.ko instead of
+lttng-relay.ko.
+
+Signed-off-by: UCHINO Satoshi <satoshi.uchino@toshiba.co.jp>
+Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+---
+ drivers/staging/lttng/Makefile | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/staging/lttng/Makefile b/drivers/staging/lttng/Makefile
+index 887e8a5..0f67d31 100644
+--- a/drivers/staging/lttng/Makefile
++++ b/drivers/staging/lttng/Makefile
+@@ -9,8 +9,8 @@ obj-m += lttng-ring-buffer-client-mmap-discard.o
+ obj-m += lttng-ring-buffer-client-mmap-overwrite.o
+ obj-m += lttng-ring-buffer-metadata-mmap-client.o
+
+-obj-m += lttng-relay.o
+-lttng-relay-objs := lttng-events.o lttng-abi.o \
++obj-m += lttng-tracer.o
++lttng-tracer-objs := lttng-events.o lttng-abi.o \
+ lttng-probes.o lttng-context.o \
+ lttng-context-pid.o lttng-context-procname.o \
+ lttng-context-prio.o lttng-context-nice.o \
+@@ -23,11 +23,11 @@ obj-m += lttng-statedump.o
+ lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o
+
+ ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
+-lttng-relay-objs += lttng-syscalls.o
++lttng-tracer-objs += lttng-syscalls.o
+ endif
+
+ ifneq ($(CONFIG_PERF_EVENTS),)
+-lttng-relay-objs += $(shell \
++lttng-tracer-objs += $(shell \
+ if [ $(VERSION) -ge 3 \
+ -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 33 \) ] ; then \
+ echo "lttng-context-perf-counters.o" ; fi;)
+--
+1.7.4.1
+
+_______________________________________________
+LTSI-dev mailing list
+LTSI-dev@lists.linuxfoundation.org
+https://lists.linuxfoundation.org/mailman/listinfo/ltsi-dev
+
diff --git a/series b/series
index 43d90361cc65a7..e9d8e0e8ec464e 100644
--- a/series
+++ b/series
@@ -367,6 +367,7 @@ patches.lttng/0173-staging-lttng-TODO-update-lttng-reported-to-work-fin.patch
patches.lttng/0174-staging-lttng-Update-max-symbol-length-to-256.patch
patches.lttng/lttng-update-to-v2.0.1.patch
patches.lttng/lttng-update-2.0.1-to-2.0.4.patch
+patches.lttng/lttng-fix-module-name-lttng-relay.ko-lttng-tracer.ko.patch
patches.runtime_pm/0001-Revert-PM-Runtime-Automatically-retry-failed-autosus.patch
patches.runtime_pm/0002-PM-Domains-Rename-struct-dev_power_domain-to-struct-.patch