update marker

git-svn-id: http://ltt.polymtl.ca/svn@2391 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/scripts/lttng-6-split-script.sh b/scripts/lttng-6-split-script.sh
index d6a25f10cbc6ad3013e5196c961f73c59c7fd29f..52b810d5d2348264da61fcdf10269db9baa2d32e 100755 (executable)
--- a/scripts/lttng-6-split-script.sh
+++ b/scripts/lttng-6-split-script.sh
@@ -113,7 +113,9 @@ FILE=../${PRENAME}${COUNT}${NAME}-markers-powerpc.diff
 VALUE=$(( ${VALUE} + 1 ))
 printf -v COUNT "%02d" ${VALUE}
 
-IN="?_include_asm-powerpc_marker.h"
+IN="?_include_asm-powerpc_marker.h
+?_arch_powerpc_kernel_marker.c
+?_arch_powerpc_kernel_Makefile"
 
 for a in $IN; do wr $a $FILE; done
 

diff --git a/tests/kernel/Makefile b/tests/kernel/Makefile
index 23b718bd0ca473171e914769025a39a4e86f1f28..1d947906b9dd201ec0c3bf62aaceea84688d23e2 100644 (file)
--- a/tests/kernel/Makefile
+++ b/tests/kernel/Makefile
@@ -9,9 +9,12 @@ ifneq ($(CONFIG_LTT),)
 #      obj-m += test-printk-effect.o
 endif
        obj-m += test-debugfs.o
+#      obj-m += test-mod.o
+#      obj-m += atomic-pIII-cmx.o
        obj-m += test-hotplug.o
        obj-m += rdtsc-smp.o
        obj-m += test-local.o
+       obj-m += test-ser.o
 #      obj-m += test-cmpxchg.o
 #      obj-m += test-cmpxchg-nolock.o
 #      obj-m += test-spinlock.o
@@ -23,7 +26,8 @@ endif
        #obj-m += test-kprobes.o
        #obj-m += test-printk.o
        #obj-m += test-debugfs.o
-#      obj-m += test-mark.o
+       obj-m += test-mark.o
+       obj-m += test-markxmc.o
 #      obj-m += probe.o
 #      obj-m += test-irqloop.o
        #obj-m += marker-loader.o

diff --git a/tests/kernel/test-local.c b/tests/kernel/test-local.c
index 3f74375ac000c134c18d6635d97bfdd70fd65cb7..967a4a2a84217f5aa07cc35ff9ce8e8807e24beb 100644 (file)
--- a/tests/kernel/test-local.c
+++ b/tests/kernel/test-local.c
@@ -5,7 +5,6 @@
 
 
 #include <asm/local.h>
-#include <linux/init.h>
 #include <linux/module.h>
 #include <linux/timer.h>
 
@@ -27,6 +26,7 @@ static void test_each(void *info)
         * put_cpu_var(counters);
         */
 }
+
 static void do_test_timer(unsigned long data)
 {
        int cpu;

diff --git a/tests/markers/Makefile b/tests/markers/Makefile
index 47003986dc8b4dfb7ae6bbf9bf48d6472ee02a83..3df8462ef196a4a5b6199fe384c0b15f6e313ab8 100644 (file)
--- a/tests/markers/Makefile
+++ b/tests/markers/Makefile
@@ -10,6 +10,7 @@ endif
        obj-m += test-micro-loop-probe.o
        obj-m += test-asm.o
        obj-m += test-kprobes.o
+       obj-m += test-micro-loop-nop.o
 else
        KERNELDIR ?= /lib/modules/$(shell uname -r)/build
        PWD := $(shell pwd)