Header guards (#pragma once) for all kernel headers

kernel/buf.h

@@ -1,3 +1,9 @@
+#pragma once
+
+#include "types.h"
+#include "sleeplock.h"
+#include "fs.h"
+
 struct buf {
   int              valid; // has data been read from disk?
   int              disk;  // does disk "own" buf?

kernel/defs.h

@@ -1,3 +1,8 @@
+#pragma once
+
+#include "riscv.h"
+#include "types.h"
+
 struct buf;
 struct context;
 struct file;

kernel/elf.h

@@ -1,3 +1,7 @@
+#pragma once
+
+#include "types.h"
+
 // Format of an ELF executable file
 
 #define ELF_MAGIC 0x464C457FU // "\x7FELF" in little endian

kernel/fcntl.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #define O_RDONLY 0x000
 #define O_WRONLY 0x001
 #define O_RDWR   0x002

kernel/file.h

@@ -1,3 +1,9 @@
+#pragma once
+
+#include "types.h"
+#include "sleeplock.h"
+#include "fs.h"
+
 struct file {
   enum { FD_NONE, FD_PIPE, FD_INODE, FD_DEVICE } type;
   int           ref; // reference count

kernel/fs.h

@@ -1,3 +1,7 @@
+#pragma once
+
+#include "types.h"
+
 // On-disk file system format.
 // Both the kernel and user programs use this header file.
 

kernel/memlayout.h

@@ -1,3 +1,5 @@
+#pragma once
+
 // Physical memory layout
 
 // qemu -machine virt is set up like this,

kernel/param.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #define NPROC       64                // maximum number of processes
 #define NCPU        8                 // maximum number of CPUs
 #define NOFILE      16                // open files per process

kernel/proc.h

@@ -1,3 +1,10 @@
+#pragma once
+
+#include "types.h"
+#include "param.h"
+#include "riscv.h"
+#include "spinlock.h"
+
 // Saved registers for kernel context switches.
 struct context {
   u64 ra;

kernel/riscv.h

@@ -1,3 +1,7 @@
+#pragma once
+
+#include "types.h"
+
 #ifndef __ASSEMBLER__
 
 // which hart (core) is this?

kernel/sleeplock.h

@@ -1,3 +1,8 @@
+#pragma once
+
+#include "types.h"
+#include "spinlock.h"
+
 // Long-term locks for processes
 struct sleeplock {
   u32             locked; // Is the lock held?

kernel/spinlock.h

@@ -1,3 +1,7 @@
+#pragma once
+
+#include "types.h"
+
 // Mutual exclusion lock.
 struct spinlock {
   u32 locked; // Is the lock held?

kernel/stat.h

@@ -1,3 +1,7 @@
+#pragma once
+
+#include "types.h"
+
 #define T_DIR    1 // Directory
 #define T_FILE   2 // File
 #define T_DEVICE 3 // Device

kernel/syscall.h

@@ -1,3 +1,5 @@
+#pragma once
+
 // System call numbers
 #define SYS_fork   1
 #define SYS_exit   2

kernel/types.h

@@ -1,3 +1,5 @@
+#pragma once
+
 typedef unsigned char  u8;
 typedef unsigned short u16;
 typedef unsigned int   u32;

kernel/virtio.h

@@ -1,4 +1,7 @@
-//
+#pragma once
+
+#include "types.h"
+
 // virtio device definitions.
 // for both the mmio interface, and virtio descriptors.
 // only tested with qemu.

user/user.h

@@ -1,3 +1,7 @@
+#pragma once
+
+#include "../kernel/types.h"
+
 struct stat;
 
 // system calls
@@ -22,6 +26,7 @@ int   getpid(void);
 char *sbrk(int);
 int   sleep(int);
 int   uptime(void);
+int   trace(int);
 
 // ulib.c
 int   stat(const char *, struct stat *);