5 files changed, 8 insertions, 24 deletions
diff --git a/runtime/probes/where_func/Makefile b/runtime/probes/where_func/Makefile
deleted file mode 100644
index c2c7d6bd..00000000
--- a/runtime/probes/where_func/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile
-
-PWD     := $(shell pwd)
-RT	:= $(PWD)/../..
-KVERSION	:= $(shell uname -r)
-KDIR	:= /lib/modules/$(KVERSION)/build include
-
-KALLSYMS_LOOKUP_NAME	:= 0x$(firstword $(shell grep " kallsyms_lookup_name" /boot/System.map-$(KVERSION)))
-KALLSYMS_LOOKUP	:= 0x$(firstword $(shell grep " kallsyms_lookup$$" /boot/System.map-$(KVERSION)))
-KTA	:= 0x$(firstword $(shell grep "__kernel_text_address" /boot/System.map-$(KVERSION)))
-
-EXTRA_CFLAGS := -I $(RT) -I $(RT)/relayfs -D KALLSYMS_LOOKUP_NAME=$(KALLSYMS_LOOKUP_NAME) -D KALLSYMS_LOOKUP=$(KALLSYMS_LOOKUP) -DKTA=$(KTA)
-
-obj-m := kprobe_where_funct.o
-
-
-default:
-	$(MAKE) V=1 -C $(KDIR) M=$(PWD) RT=$(RT) modules
-
-clean:
-	/bin/rm -rf *.o *.ko *~ *.mod.c .*.cmd .tmp_versions
diff --git a/runtime/probes/where_func/README b/runtime/probes/where_func/README
index 4c57614b..b73aca05 100644
--- a/runtime/probes/where_func/README
+++ b/runtime/probes/where_func/README
@@ -23,4 +23,7 @@ The instrumentation is removed as root with:
 /sbin/rmmod kprobe_funct_where
 \endcode
 -Will Cohen
+
+Note that this module is broken now because we don't pass the module parameter
+tp stpd.  FIXME
 */
diff --git a/runtime/probes/where_func/build b/runtime/probes/where_func/build
new file mode 100755
index 00000000..f3e83244
--- /dev/null
+++ b/runtime/probes/where_func/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+../build_probe $*
diff --git a/runtime/probes/where_func/kprobe_where_funct.c b/runtime/probes/where_func/kprobe_where_funct.c
index a325693a..e029a080 100644
--- a/runtime/probes/where_func/kprobe_where_funct.c
+++ b/runtime/probes/where_func/kprobe_where_funct.c
@@ -8,12 +8,11 @@
 #define STP_NUM_STRINGS 1
 #include "runtime.h"
 
+#define NEED_INT64_VALS
+
 #define KEY1_TYPE INT64
 #include "map-keys.c"
 
-#define VALUE_TYPE INT64
-#include "map-values.c"
-
 #include "map.c"
 #include "probes.c"
 #include "sym.c"
diff --git a/runtime/probes/where_func/targets b/runtime/probes/where_func/targets
new file mode 100644
index 00000000..7e8e4cf1
--- /dev/null
+++ b/runtime/probes/where_func/targets
@@ -0,0 +1 @@
+kprobe_where_funct