Merge branch 'master' of ssh://code.systems.ethz.ch:8006/source/barrelfish
authorRazvan Damachi <razvan.damachi@gmail.com>
Thu, 31 Aug 2017 14:42:27 +0000 (16:42 +0200)
committerSimon Gerber <simon.gerber@inf.ethz.ch>
Thu, 31 Aug 2017 14:43:08 +0000 (16:43 +0200)
Signed-off-by: Razvan Damachi <razvan.damachi@gmail.com>

13 files changed:
1  2 
errors/errno.fugu
if/Hakefile
include/barrelfish_kpi/types.h
kernel/cap_delete.c
kernel/capabilities.c
lib/barrelfish/Hakefile
lib/barrelfish/debug.c
lib/barrelfish/init.c
lib/barrelfish/threads.c
lib/mdb/mdb_tree.c
platforms/Hakefile
tools/harness/machines/__init__.py
usr/monitor/inter.c

Simple merge
diff --cc if/Hakefile
Simple merge
Simple merge
Simple merge
@@@ -1333,7 -1295,8 +1335,8 @@@ errval_t caps_create_from_existing(stru
  //{{{1 Capability creation
  
  /// check arguments, return true iff ok
 -STATIC_ASSERT(48 == ObjType_Num, "Knowledge of all cap types");
 +STATIC_ASSERT(50 == ObjType_Num, "Knowledge of all cap types");
+ #ifndef NDEBUG
  static bool check_caps_create_arguments(enum objtype type,
                                          size_t bytes, size_t objsize,
                                          bool exact)
Simple merge
Simple merge
Simple merge
@@@ -1291,10 -1291,9 +1291,9 @@@ void threads_prepare_to_span(dispatcher
              errval_t err;
  
              size_t blocksize = sizeof(struct thread) + tls_block_total_len;
 -            err = vspace_mmu_aware_map(&thread_slabs_vm, blocksize,
 +            err = vspace_mmu_aware_map(&thread_slabs_vm, 64 * blocksize,
                                         &buf, &size);
              if (err_is_fail(err)) {
-                 slot_free(frame);
                  if (err_no(err) == LIB_ERR_VSPACE_MMU_AWARE_NO_SPACE) {
                      // we've wasted space with fragmentation
                      // cross our fingers and hope for the best...
Simple merge
Simple merge
Simple merge
   */
  
  #include <inttypes.h>
+ #include <sys/param.h>
  #include <monitor.h>
  #include <barrelfish/dispatch.h>
 +#include <barrelfish/proc_mgmt_client.h>
  #include <trace/trace.h>
  #include "send_cap.h"
  #include "capops.h"