From 1da96a30395b20cb4e2059c49bee05540e36aac6 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Wed, 17 Jul 2013 16:15:46 -0700
Subject: [PATCH] runtime: disable preemption again to fix linux build
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Otherwise the tests in pkg/runtime fail:

runtime: unknown argument frame size for runtime.deferreturn called from 0x48657b [runtime_test.func·022]
fatal error: invalid stack
...

R=golang-dev, dave
CC=golang-dev
https://golang.org/cl/11483043
---
 src/pkg/runtime/proc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pkg/runtime/proc.c b/src/pkg/runtime/proc.c
index 74e92a63fa..3ce281fc77 100644
--- a/src/pkg/runtime/proc.c
+++ b/src/pkg/runtime/proc.c
@@ -2175,6 +2175,12 @@ preemptone(P *p)
 	M *mp;
 	G *gp;
 
+// Preemption requires more robust traceback routines.
+// For now, disable.
+// The if(1) silences a compiler warning about the rest of the
+// function being unreachable.
+if(1) return;
+
 	mp = p->m;
 	if(mp == nil || mp == m)
 		return;
-- 
2.48.1