summaryrefslogtreecommitdiff
path: root/kernel/sysfile.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2019-07-08 15:50:06 -0400
committerFrans Kaashoek <[email protected]>2019-07-08 15:50:06 -0400
commit2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc (patch)
tree189387b82cfd998170d39dfc998de0fc86602544 /kernel/sysfile.c
parent75b0c6fc91c1264aaa5d080d9faeb87c90d02ad3 (diff)
parent60ed537427c31d320ca4c8778d21d13304285b00 (diff)
downloadxv6-labs-2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc.tar.gz
xv6-labs-2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc.tar.bz2
xv6-labs-2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc.zip
Merge branch 'riscv-proc' into riscv
Diffstat (limited to 'kernel/sysfile.c')
-rw-r--r--kernel/sysfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysfile.c b/kernel/sysfile.c
index 77e273f..533e097 100644
--- a/kernel/sysfile.c
+++ b/kernel/sysfile.c
@@ -9,9 +9,9 @@
#include "defs.h"
#include "param.h"
#include "stat.h"
+#include "spinlock.h"
#include "proc.h"
#include "fs.h"
-#include "spinlock.h"
#include "sleeplock.h"
#include "file.h"
#include "fcntl.h"