Merge branch 'master' into distops
authorSimon Gerber <simon.gerber@inf.ethz.ch>
Wed, 26 Nov 2014 17:08:04 +0000 (18:08 +0100)
committerSimon Gerber <simon.gerber@inf.ethz.ch>
Wed, 26 Nov 2014 17:08:04 +0000 (18:08 +0100)
commit9aebe809200cc8cb247269e6a55b3779587ee12c
tree3f41bd4f22c1936acc16e8167f881d04c2b6b6a4
parent2af3119acf34c4ada4d92bfb709680b2a69d10ca
parent2fde92565122f67d2b07ba02a2f7d82e83e0071a
Merge branch 'master' into distops

capsend_broadcast() is broken because we don't have static value of
num_monitors anymore and getting num_monitors dynamically is non-trivial.

Conflicts:
errors/errno.fugu
if/intermon.if
if/monitor.if
if/monitor_blocking.if
include/arch/arm/barrelfish/invocations_arch.h
include/arch/x86_32/barrelfish/invocations_arch.h
include/mdb/mdb_tree.h
kernel/Hakefile
kernel/arch/arm/syscall.c
kernel/arch/armv7/irq.c
kernel/arch/x86/start_aps.c
kernel/arch/x86_64/syscall.c
kernel/capabilities.c
kernel/include/capabilities.h
kernel/startup.c
lib/barrelfish/init.c
lib/barrelfish/spawn_client.c
usr/kaluga/main.c
usr/monitor/arch/armv7/boot.c
usr/monitor/arch/x86/boot.c
usr/monitor/boot.c
usr/monitor/include/arch/arm/monitor_invocations.h
usr/monitor/include/arch/x86_64/monitor_invocations.h
usr/monitor/include/monitor.h
usr/monitor/inter.c
usr/monitor/monitor_server.c
usr/spawnd/service.c
usr/startd/main.c
55 files changed:
errors/errno.fugu
if/intermon.if
if/monitor.if
if/monitor_blocking.if
include/arch/arm/barrelfish/invocations_arch.h
include/arch/x86_32/barrelfish/invocations_arch.h
include/arch/x86_64/barrelfish/invocations_arch.h
include/barrelfish/caddr.h
include/barrelfish/dispatch.h
include/barrelfish/domain.h
include/barrelfish_kpi/capabilities.h
include/barrelfish_kpi/distcaps.h
include/barrelfish_kpi/syscalls.h
include/mdb/mdb_tree.h
include/trace/trace.h
kernel/Hakefile
kernel/arch/arm/syscall.c
kernel/arch/arm_gem5/startup_arch.c
kernel/arch/armv7/irq.c
kernel/arch/omap44xx/startup_arch.c
kernel/arch/x86/startup_x86.c
kernel/arch/x86_32/syscall.c
kernel/arch/x86_64/startup_arch.c
kernel/arch/x86_64/syscall.c
kernel/capabilities.c
kernel/dispatch.c
kernel/include/arch/arm/syscall_arm.h
kernel/include/capabilities.h
kernel/include/dispatch.h
kernel/include/syscall.h
kernel/startup.c
kernel/syscall.c
lib/barrelfish/capabilities.c
lib/barrelfish/init.c
lib/barrelfish/monitor_client.c
lib/barrelfish/spawn_client.c
lib/mdb/mdb_tree.c
lib/mm/mm.c
tools/asmoffsets/asmoffsets.c
usr/fish/fish_arm.c
usr/kaluga/main.c
usr/monitor/boot.c
usr/monitor/capops/capsend.c
usr/monitor/capops/init.c
usr/monitor/include/arch/arm/monitor_invocations_arch.h
usr/monitor/include/arch/x86_32/monitor_invocations_arch.h
usr/monitor/include/arch/x86_64/monitor_invocations_arch.h
usr/monitor/include/monitor.h
usr/monitor/include/monitor_server.h
usr/monitor/inter.c
usr/monitor/intermon_bindings.c
usr/monitor/monitor_rpc_server.c
usr/monitor/monitor_server.c
usr/monitor/spawn.c
usr/spawnd/service.c