runtime: two trivial but important bug fixes

R=r
https://golang.org/cl/156059

diff --git a/src/pkg/runtime/darwin/386/sys.s b/src/pkg/runtime/darwin/386/sys.s
index 66253c99d36690898c920ddd59059a07d6f5e5cf..445f5300288d4ba6026fc88a81a082e08f8f1e47 100644 (file)
--- a/src/pkg/runtime/darwin/386/sys.s
+++ b/src/pkg/runtime/darwin/386/sys.s
@@ -287,7 +287,7 @@ TEXT setldt(SB),7,$32
        ORL     $0x40, CX               // 32-bit operand size
        MOVB    CX, 6(AX)
 
-       MOVL    $0xF2, 5(AX)    // r/w data descriptor, dpl=3, present
+       MOVB    $0xF2, 5(AX)    // r/w data descriptor, dpl=3, present
 
        // call i386_set_ldt(entry, desc, 1)
        MOVL    $0xffffffff, 0(SP)      // auto-allocate entry and return in AX

diff --git a/src/pkg/runtime/proc.c b/src/pkg/runtime/proc.c
index 35e2ad77eac45c7d5d159dc092eac4c0c23b46cc..e6e811c5c38910a59e792da17618893666e55cb9 100644 (file)
--- a/src/pkg/runtime/proc.c
+++ b/src/pkg/runtime/proc.c
@@ -413,7 +413,7 @@ matchmg(void)
 {
        G *g;
 
-       if(m->mallocing)
+       if(m->mallocing || m->gcing)
                return;
        while(sched.mcpu < sched.mcpumax && (g = gget()) != nil){
                M *m;