diff --git a/cpu/msp430/mtarch.c b/cpu/msp430/mtarch.c
index f1b7f63ca..da75c9962 100644
--- a/cpu/msp430/mtarch.c
+++ b/cpu/msp430/mtarch.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: mtarch.c,v 1.2 2006/09/01 22:56:18 adamdunkels Exp $
+ * @(#)$Id: mtarch.c,v 1.3 2006/09/26 20:56:56 adamdunkels Exp $
  */
 
 #include <stdio.h>
@@ -46,17 +46,22 @@ void
 mtarch_start(struct mtarch_thread *t,
 	     void (*function)(void *), void *data)
 {
+  int i;
+
+  for(i = 0; i < MTARCH_STACKSIZE; ++i) {
+    t->stack[i] = i;
+  }
 
   t->sp = &t->stack[MTARCH_STACKSIZE - 1];
-  
+
   *t->sp = (unsigned short)mt_exit;
   --t->sp;
+
   *t->sp = (unsigned short)function;
   --t->sp;
-  
+
   /* Space for registers. */
   t->sp -= 11;
-
 }
 /*--------------------------------------------------------------------------*/
 static unsigned short *sptmp;
@@ -130,3 +135,14 @@ mtarch_pstart(void)
   
 }
 /*--------------------------------------------------------------------------*/
+int
+mtarch_stack_usage(struct mt_thread *t)
+{
+  int i;
+  for(i = 0; i < MTARCH_STACKSIZE; ++i) {
+    if(t->thread.stack[i] != (unsigned short)i) {
+      return MTARCH_STACKSIZE - i;
+    }
+  }
+}
+/*--------------------------------------------------------------------------*/
diff --git a/cpu/msp430/mtarch.h b/cpu/msp430/mtarch.h
index c4d70e3bb..13d34b22c 100644
--- a/cpu/msp430/mtarch.h
+++ b/cpu/msp430/mtarch.h
@@ -1,44 +1,49 @@
 /*
  * Copyright (c) 2005, Swedish Institute of Computer Science
- * All rights reserved. 
+ * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
- * 3. Neither the name of the Institute nor the names of its contributors 
- *    may be used to endorse or promote products derived from this software 
- *    without specific prior written permission. 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE. 
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: mtarch.h,v 1.1 2006/06/17 22:41:21 adamdunkels Exp $
+ * @(#)$Id: mtarch.h,v 1.2 2006/09/26 20:56:56 adamdunkels Exp $
  */
 #ifndef __MTARCH_H__
 #define __MTARCH_H__
 
-#define MTARCH_STACKSIZE 64
+#define MTARCH_STACKSIZE 128
 
 struct mtarch_thread {
-  unsigned short stack[MTARCH_STACKSIZE];  
+  unsigned short stack[MTARCH_STACKSIZE];
   unsigned short *sp;
 };
 
+struct mt_thread;
+
+int mtarch_stack_usage(struct mt_thread *t);
+
+
 #endif /* __MTARCH_H__ */
 	
diff --git a/cpu/x86/mtarch.c b/cpu/x86/mtarch.c
index cd6f55a47..49df85c9e 100644
--- a/cpu/x86/mtarch.c
+++ b/cpu/x86/mtarch.c
@@ -27,7 +27,14 @@ void
 mtarch_start(struct mtarch_thread *t,
 	     void (*function)(void *), void *data)
 {
+  
   struct frame *f = (struct frame *)&t->stack[MTARCH_STACKSIZE - sizeof(struct frame)/4];
+  int i;
+  
+  for(i = 0; i < MTARCH_STACKSIZE; ++i) {
+    t->stack[i] = i;
+  }
+  
   memset(f, 0, sizeof(struct frame));
   f->retaddr = (unsigned long)function;
   f->data    = (unsigned long)data;
@@ -99,3 +106,14 @@ mtarch_pstart(void)
   
 }
 /*--------------------------------------------------------------------------*/
+int
+mtarch_stack_usage(struct mt_thread *t)
+{
+  int i;
+  for(i = 0; i < MTARCH_STACKSIZE; ++i) {
+    if(t->thread.stack[i] != i) {
+      return MTARCH_STACKSIZE - i;
+    }
+  }
+}
+/*--------------------------------------------------------------------------*/
diff --git a/cpu/x86/mtarch.h b/cpu/x86/mtarch.h
index fe9da7ec6..a85280e3d 100644
--- a/cpu/x86/mtarch.h
+++ b/cpu/x86/mtarch.h
@@ -41,5 +41,9 @@ struct mtarch_thread {
   unsigned long sp;
 };
 
+struct mt_thread;
+
+int mtarch_stack_usage(struct mt_thread *t);
+
 #endif /* __MTARCH_H__ */