update

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

diff --git a/marker-loader/Makefile b/marker-loader/Makefile
index 6523d116afca5f6d7917ee85c4bf4bf5f5ab4917..2b0e85bd95b81e0571ad0c6821c5d6c91062b9b2 100644 (file)
--- a/marker-loader/Makefile
+++ b/marker-loader/Makefile
@@ -1,5 +1,14 @@
 ifneq ($(KERNELRELEASE),)
-       obj-m += marker-loader.o
+
+export MARKER_CFLAGS
+
+MARKER_CFLAGS  := -DCALL="__mark_$(TARGET)_call" -DJUMP_OVER="__mark_$(TARGET)_jump_over"
+MARKER_CFLAGS  += -DJUMP_CALL="__mark_$(TARGET)_jump_call" -DJUMP_INLINE="__mark_$(TARGET)_jump_inline"
+
+EXTRA_CFLAGS   += $(MARKER_CFLAGS)
+
+obj-m += marker-loader.o
+
 else
        KERNELDIR ?= /lib/modules/$(shell uname -r)/build
        PWD := $(shell pwd)

diff --git a/marker-loader/marker-loader.c b/marker-loader/marker-loader.c
index 5686c21052f49974c86e86253748b39f8ae8d40b..9fd079cc57a23ed4ebd1730969a465b4bde4c24d 100644 (file)
--- a/marker-loader/marker-loader.c
+++ b/marker-loader/marker-loader.c
@@ -21,12 +21,10 @@ void do_mark1(const char *format, int value)
 }
 
 
-#define PROBE_NAME subsys_mark1
-
-#define CALL __mark_subsys_mark1_call
-#define JUMP_OVER __mark_subsys_mark1_jump_over
-#define JUMP_CALL __mark_subsys_mark1_jump_call
-#define JUMP_INLINE __mark_subsys_mark1_jump_inline
+//#define CALL __mark_subsys_mark1_call
+//#define JUMP_OVER __mark_subsys_mark1_jump_over
+//#define JUMP_CALL __mark_subsys_mark1_jump_call
+//#define JUMP_INLINE __mark_subsys_mark1_jump_inline
 
 static void *saved_over;