* The relevant files have been modified in order to compile with McKernel.

Conflicts:
	kernel/Makefile.build.in

lib/include/ihk/cpu.h

@@ -24,6 +24,7 @@ void cpu_halt(void);
 void cpu_safe_halt(void);
 void cpu_restore_interrupt(unsigned long);
 void cpu_pause(void);
+void cpu_relax(void);
 
 #define barrier()   arch_barrier()