Index: arch/ia32/include/debug.h
===================================================================
--- arch/ia32/include/debug.h	(revision 0cfc4d389c6bbe87d402907055dc2caad426d954)
+++ arch/ia32/include/debug.h	(revision 3fc03fd55a97ee8c78eecc373fec290d6bd547d9)
@@ -32,10 +32,4 @@
 #include <arch/asm.h>
 
-/** Return caller of this function 
- *
- * @param first_arg First argument of the function
- */
-#define CALLER(first_arg) 	 ((__address *) &first_arg)[-1];
-
 #define HERE get_ip()
 
Index: arch/mips32/include/debug.h
===================================================================
--- arch/mips32/include/debug.h	(revision 0cfc4d389c6bbe87d402907055dc2caad426d954)
+++ arch/mips32/include/debug.h	(revision 3fc03fd55a97ee8c78eecc373fec290d6bd547d9)
@@ -43,17 +43,4 @@
 #define ___intmode()	asm volatile ( "\t.word\t0x29\n");
 
-/** Return current IP address */
-static inline __address * _get_ra() 
-{
-	__address *ip;
-
-	__asm__ volatile (
-		"mov %%31, %0"
-		: "=r" (ip)
-		);
-	return ip;
-}
-#define CALLER(first_arg)    (_get_ra())
-
 
 #endif