Merge remote-tracking branch 'origin/master' into shoal
authorReto Achermann <reto.achermann@inf.ethz.ch>
Fri, 5 Dec 2014 08:54:20 +0000 (09:54 +0100)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Fri, 5 Dec 2014 08:54:20 +0000 (09:54 +0100)
Conflicts:
kernel/arch/k1om/vmkit.c
kernel/arch/x86_64/syscall.c
usr/kaluga/start_cpu.c

1  2 
hake/symbolic_targets.mk
kernel/arch/x86_64/syscall.c
lib/vfs/vfs_fat.c
usr/drivers/cpuboot/common.c

Simple merge
  #include <arch/x86/apic.h>
  #include <arch/x86/global.h>
  #include <arch/x86/perfmon.h>
 -#include <vmkit.h>
 -#include <barrelfish_kpi/sys_debug.h>
 -#include <barrelfish_kpi/lmp.h>
 -#include <barrelfish_kpi/dispatcher_shared_target.h>
  #include <arch/x86/debugregs.h>
 -#include <trace/trace.h>
  #include <arch/x86/syscall.h>
  #include <arch/x86/timing.h>
 -#include <fpu.h>
  #include <arch/x86/ipi_notify.h>
 +#include <barrelfish_kpi/sys_debug.h>
 +#include <barrelfish_kpi/lmp.h>
 +#include <barrelfish_kpi/dispatcher_shared_target.h>
 +#include <trace/trace.h>
 +#ifndef __k1om__
 +#include <vmkit.h>
- #include <amd_vmcb_dev.h>
+ #include <dev/amd_vmcb_dev.h>
 +#endif
  
  #define MIN(a,b)        ((a) < (b) ? (a) : (b))
  
Simple merge
Simple merge