From df84925b45ca32c40430a114449066aebc58508d Mon Sep 17 00:00:00 2001
From: Flaper Fesp <flaper87@gmail.com>
Date: Tue, 27 Aug 2013 09:53:31 +0200
Subject: [PATCH] Rebased and replaced yield with deschedule

---
 src/libstd/task/mod.rs | 2 +-
 src/llvm               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs
index 74e1af540c0..b1439fd763d 100644
--- a/src/libstd/task/mod.rs
+++ b/src/libstd/task/mod.rs
@@ -680,7 +680,7 @@ fn test_rekillable_not_nested() {
         // receiving anything since
         // this block should be nested
         // into a unkillable block.
-        yield();
+        deschedule();
     }
 }
 
diff --git a/src/llvm b/src/llvm
index f67442eee27..0964c68ddf2 160000
--- a/src/llvm
+++ b/src/llvm
@@ -1 +1 @@
-Subproject commit f67442eee27d3d075a65cf7f9a70f7ec6649ffd1
+Subproject commit 0964c68ddf2c67ce455e7443a06f4bb3db9e92bb