Merged.
authorSimon Peter <simpeter@cs.washington.edu>
Wed, 13 Nov 2013 05:54:53 +0000 (21:54 -0800)
committerSimon Peter <simpeter@cs.washington.edu>
Wed, 13 Nov 2013 05:54:53 +0000 (21:54 -0800)
16 files changed:
1  2 
errors/errno.fugu
hake/ArchDefaults.hs
hake/Config.hs.template
hake/RuleDefs.hs
hake/symbolic_targets.mk
if/Hakefile
include/barrelfish/core_state.h
kernel/arch/x86_64/syscall.c
lib/barrelfish/Hakefile
lib/barrelfish/debug.c
lib/barrelfish/domain.c
lib/barrelfish/init.c
lib/octopus/client/getset.c
lib/octopus/server/init.c
lib/octopus/server/service.c
usr/fish/fish.c

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -156,8 -161,7 +163,9 @@@ MODULES_x86_64= 
        sbin/bcached \
        sbin/testdesc \
        sbin/testdesc-child \
 +      sbin/angler \
 +      sbin/sshd \
+       sbin/lshw \
  
  # the following are broken in the newidc system
  MODULES_x86_64_broken= \
diff --cc if/Hakefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc usr/fish/fish.c
@@@ -302,10 -295,10 +303,10 @@@ static int demo(int argc, char *argv[]
              while (rdtsc() - now < pixwidth) ;
          }
  
-         trace_event(TRACE_SUBSYS_BENCH, TRACE_EVENT_PCBENCH, 0);
+         trace_event(TRACE_SUBSYS_BENCH, TRACE_EVENT_BENCH_PCBENCH, 0);
          }
      }
 -    return 0;
 +    return EXIT_SUCCESS;
  }
  
  static int oncore(int argc, char *argv[])