X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Ftasklets.c;h=cdd2117aceacf51710bc8067e646a91657e0144c;hb=b273a6b2b560f8c6d5b975be86827064a140a3ea;hp=28e7644d29cf3ab2f77cb4d1acd16e612f454dc2;hpb=5f5bed4643181a26ab8b7a529f032ee1e3c7cb96;p=mono.git

diff --git a/mono/mini/tasklets.c b/mono/mini/tasklets.c
index 28e7644d29c..cdd2117acea 100644
--- a/mono/mini/tasklets.c
+++ b/mono/mini/tasklets.c
@@ -20,7 +20,7 @@ internal_init (void)
 	if (keepalive_stacks)
 		return;
 	MONO_GC_REGISTER_ROOT_PINNING (keepalive_stacks);
-	keepalive_stacks = mono_g_hash_table_new (NULL, NULL);
+	keepalive_stacks = mono_g_hash_table_new_type (NULL, NULL, MONO_HASH_CONSERVATIVE_GC);
 }
 
 static void*
@@ -69,7 +69,7 @@ continuation_mark_frame (MonoContinuation *cont)
 		ctx = new_ctx;
 		if (endloop)
 			break;
-		if (strcmp (jinfo_get_method (ji)->name, "Mark") == 0)
+		if (!ji->is_trampoline && strcmp (jinfo_get_method (ji)->name, "Mark") == 0)
 			endloop = TRUE;
 	} while (1);