Catalli's threaded switch

[sliver-openvswitch.git] / lib / backtrace.c

diff --git a/lib/backtrace.c b/lib/backtrace.c
index 2f47809..d2d1e40 100644 (file)
--- a/lib/backtrace.c
+++ b/lib/backtrace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include "compiler.h"
-
-#define THIS_MODULE VLM_backtrace
 #include "vlog.h"
 
-static uintptr_t UNUSED
+VLOG_DEFINE_THIS_MODULE(backtrace)
+
+static uintptr_t OVS_UNUSED
 get_max_stack(void)
 {
     static const char file_name[] = "/proc/self/maps";
@@ -69,20 +69,8 @@ stack_high(void)
 static uintptr_t
 stack_low(void)
 {
-#ifdef __i386__
-    uintptr_t low;
-    asm("movl %%esp,%0" : "=g" (low));
-    return low;
-#elif __x86_64__
-    uintptr_t low;
-    asm("movq %%rsp,%0" : "=g" (low));
+    uintptr_t low = (uintptr_t) &low;
     return low;
-#else
-    /* This causes a warning in GCC that cannot be disabled, so use it only on
-     * non-x86. */
-    int dummy;
-    return (uintptr_t) &dummy;
-#endif
 }
 
 static bool