Merge "Header guards and missing includes addition."

mmu.h

@@ -1,3 +1,6 @@
+#ifndef XV6_MMU_H
+#define XV6_MMU_H
+
 // This file contains definitions for the
 // x86 memory management unit (MMU).
 
@@ -226,3 +229,5 @@ struct gatedesc {
 }
 
 #endif
+
+#endif

param.h

@@ -1,3 +1,6 @@
+#ifndef XV6_PARAM_H
+#define XV6_PARAM_H
+
 #define NPROC        64  // maximum number of processes
 #define KSTACKSIZE 4096  // size of per-process kernel stack
 #define NCPU          8  // maximum number of CPUs
@@ -13,3 +16,5 @@
 #define FSSIZE       2000  // size of file system in blocks
 #define INT_FSSIZE   80  // size of internal file systems in blocks
 #define NNAMESPACE   20  // maximum number of namespaces
+
+#endif

proc.h

@@ -1,3 +1,9 @@
+#include "types.h"
+#include "mmu.h"
+
+#ifndef XV6_PROC_H
+#define XV6_PROC_H
+
 // Per-CPU state
 struct cpu {
   uchar apicid;                // Local APIC ID
@@ -85,3 +91,5 @@ void proc_unlock();
 //   original data and bss
 //   fixed-size stack
 //   expandable heap
+
+#endif

types.h

@@ -1,4 +1,9 @@
+#ifndef XV6_TYPES_H
+#define XV6_TYPES_H
+
 typedef unsigned int   uint;
 typedef unsigned short ushort;
 typedef unsigned char  uchar;
 typedef uint pde_t;
+
+#endif