Merge remote-tracking branch 'origin/master' into shoal
authorReto Achermann <acreto@student.ethz.ch>
Sun, 14 Dec 2014 10:26:47 +0000 (11:26 +0100)
committerReto Achermann <acreto@student.ethz.ch>
Sun, 14 Dec 2014 10:26:47 +0000 (11:26 +0100)
commit1f453fcf38cf0c5762b5adfcad07af99dc1e62fe
tree7362024d288c95437bf61ebc276478989ee36ec3
parent2b6667d979590f1585c1af0a2617002a80dcf115
parent37d964868b4ce25ffbb6a2be0dfc45c748114b0c
Merge remote-tracking branch 'origin/master' into shoal

Adding of missing architecture specific functions for the K1OM.

Conflicts:
kernel/arch/x86_64/syscall.c
usr/drivers/cpuboot/x86boot.c
usr/fish/fish_arm.c
usr/fish/fish_common.c
19 files changed:
errors/errno.fugu
include/arch/k1om/barrelfish/invocations_arch.h
include/arch/k1om/barrelfish/lmp_chan_arch.h
include/barrelfish/memobj.h
kernel/Hakefile
kernel/arch/k1om/startup_arch.c
kernel/arch/x86/startup_x86.c
kernel/arch/x86_64/startup_arch.c
kernel/arch/x86_64/syscall.c
kernel/capabilities.c
lib/barrelfish/arch/k1om/sys_debug.c
usr/drivers/cpuboot/main.c
usr/drivers/cpuboot/x86boot.c
usr/fish/fish_arm.c
usr/fish/fish_common.c
usr/monitor/include/arch/k1om/monitor_invocations_arch.h
usr/monitor/main.c
usr/monitor/spawn.c
usr/tests/terminalio/pty-test.c