Reenable build for master

redox-os · aaeb4db64487f8a1cc32860f4e5d2986fd603740 · jackpot51 committed Feb 22, 2016 · Feb 22, 2016 · aaeb4db
1 parent ae7f896
commit aaeb4db64487f8a1cc32860f4e5d2986fd603740
Unified Split

Showing with 11 additions and 7 deletions.

+3 −3 .travis.yml

+1 −1 README.md

+6 −2 kernel/arch/context.rs

+1 −1 libc
@@ -21,6 +21,6 @@ script:
 notifications:
   email: false
   webhooks: http://37.139.9.28:54863/travis
-branches:
-  only:
-    - auto
+#branches:
+#  only:
+#    - auto
@@ -6,7 +6,7 @@ Documentation can be found [here](http://ticki.github.io/redocs/redox/).
 
 Please make sure you use the **latest nightly** of `rustc` before building (for more troubleshooting, see ["Help! Redox won't compile!"](#compile-help)).
 
-[![Travis Build Status](https://travis-ci.org/redox-os/redox.svg?branch=auto)](https://travis-ci.org/redox-os/redox)
+[![Travis Build Status](https://travis-ci.org/redox-os/redox.svg?branch=master)](https://travis-ci.org/redox-os/redox)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md)
 
 ## Contents
@@ -493,6 +493,8 @@ impl Context {
     }
 
     pub unsafe fn root() -> Box<Self> {
+        let fx = memory::alloc(512);
+
         box Context {
             pid: Context::next_pid(),
             ppid: 0,
@@ -506,7 +508,7 @@ impl Context {
 
             kernel_stack: 0,
             regs: Regs::default(),
-            fx: memory::alloc(512),
+            fx: fx,
             stack: None,
             loadable: false,
 
@@ -524,6 +526,8 @@ impl Context {
         let mut regs = Regs::default();
         regs.sp = kernel_stack + CONTEXT_STACK_SIZE - 128;
 
+        let fx = kernel_stack + CONTEXT_STACK_SIZE;
+
         let mut ret = box Context {
             pid: Context::next_pid(),
             ppid: 0,
@@ -537,7 +541,7 @@ impl Context {
 
             kernel_stack: kernel_stack,
             regs: regs,
-            fx: kernel_stack + CONTEXT_STACK_SIZE,
+            fx: fx,
             stack: None,
             loadable: false,
 
@@ -1 +1 @@
-Subproject commit f1f68cc1620f45976a222cf3ae703336aceada49
+Subproject commit fbcd6c23ed4cbacf2b7510af6f43188337a57ccd