diff --git a/include/ibm/cpu.h b/include/ibm/cpu.h
new file mode 100755
index 000000000..fb1610b30
--- /dev/null
+++ b/include/ibm/cpu.h
@@ -0,0 +1,16 @@
+
+#ifndef _IBM_CPU_H
+#define _IBM_CPU_H 1
+
+#define X86_FLAG_C	(1L << 0)	/* Carry */
+#define X86_FLAG_P	(1L << 2)	/* Parity */
+#define X86_FLAG_A	(1L << 4)	/* Aux. carry */
+#define X86_FLAG_Z	(1L << 6)	/* Zero */
+#define X86_FLAG_S	(1L << 7)	/* Sign */
+
+#define X86_FLAG_T	(1L <<  8)	/* Trap */
+#define X86_FLAG_I	(1L <<  9)	/* Interrupt */
+#define X86_FLAG_D	(1L << 10)	/* Direction */
+#define X86_FLAG_O	(1L << 11)	/* Overflow */
+
+#endif
diff --git a/include/minix/config.h b/include/minix/config.h
index b854c40bc..e980a5bf2 100755
--- a/include/minix/config.h
+++ b/include/minix/config.h
@@ -67,6 +67,7 @@
 
 /* Enable or disable kernel calls (allows for minimal kernel). */
 #define ENABLE_K_DEBUGGING 0	/* kernel debugging calls */
+#define ENABLE_K_LOCKCHECK 0	/* kernel lock() sanity check */
 
 /* Include or exclude an image of /dev/boot in the boot image. */
 #define ENABLE_BOOTDEV	   0
diff --git a/include/minix/type.h b/include/minix/type.h
index 695945fc4..ba2e34bc5 100755
--- a/include/minix/type.h
+++ b/include/minix/type.h
@@ -106,6 +106,9 @@ struct kinfo {
   int nr_tasks;			/* number of kernel tasks */
   char release[4];		/* kernel release number */
   char version[4];		/* kernel version number */
+#if ENABLE_K_LOCKCHECK
+  int relocking;
+#endif
 };
 
 struct machine {