summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2016-09-02 15:27:28 -0400
committerFrans Kaashoek <[email protected]>2016-09-02 15:27:28 -0400
commit5bf3fbee00fb27cb8cb4eca72dcd9fc4c288ed71 (patch)
treeb81e77e6250e22d8698f75eff8044861db69e61f
parentb7fed77b7be4608b2ce6233a594c4fd7935e62c7 (diff)
downloadxv6-labs-5bf3fbee00fb27cb8cb4eca72dcd9fc4c288ed71.tar.gz
xv6-labs-5bf3fbee00fb27cb8cb4eca72dcd9fc4c288ed71.tar.bz2
xv6-labs-5bf3fbee00fb27cb8cb4eca72dcd9fc4c288ed71.zip
Make runoff happy
-rw-r--r--README27
-rw-r--r--elf.h3
-rw-r--r--main.c3
-rw-r--r--picirq.c3
4 files changed, 18 insertions, 18 deletions
diff --git a/README b/README
index e8ab478..e561966 100644
--- a/README
+++ b/README
@@ -15,20 +15,17 @@ xv6 borrows code from the following sources:
FreeBSD (ioapic.c)
NetBSD (console.c)
-The following people have made contributions:
- Russ Cox (context switching, locking)
- Cliff Frey (MP)
- Xiao Yu (MP)
- Nickolai Zeldovich
- Austin Clements
-
-In addition, we are grateful for the bug reports and patches contributed by
-Silas Boyd-Wickizer, Mike CAT, Nelson Elhage, Nathaniel Filardo, Peter
-Froehlich, Yakir Goaran, Shivam Handa, Bryan Henry, Jim Huang, Anders Kaseorg,
-kehao95, Eddie Kohler, Imbar Marinescu, Yandong Mao, Hitoshi Mitake, Carmi
-Merimovich, Joel Nider, Greg Price, Ayan Shafqat, Eldar Sehayek, Yongming Shen,
-Cam Tenny, Rafael Ubal, Warren Toomey, Stephen Tu, Pablo Ventura, Xi Wang,
-Keiichi Watanabe, Nicolas Wolovick, Jindong Zhang, and Zou Chang Wei.
+The following people have made contributions: Russ Cox (context switching,
+locking), Cliff Frey (MP), Xiao Yu (MP), Nickolai Zeldovich, and Austin
+Clements.
+
+We are also grateful for the bug reports and patches contributed by Silas
+Boyd-Wickizer, Mike CAT, Nelson Elhage, Nathaniel Filardo, Peter Froehlich,
+Yakir Goaran, Shivam Handa, Bryan Henry, Jim Huang, Anders Kaseorg, kehao95,
+Eddie Kohler, Imbar Marinescu, Yandong Mao, Hitoshi Mitake, Carmi Merimovich,
+Joel Nider, Greg Price, Ayan Shafqat, Eldar Sehayek, Yongming Shen, Cam Tenny,
+Rafael Ubal, Warren Toomey, Stephen Tu, Pablo Ventura, Xi Wang, Keiichi
+Watanabe, Nicolas Wolovick, Jindong Zhang, and Zou Chang Wei.
The code in the files that constitute xv6 is
Copyright 2006-2016 Frans Kaashoek, Robert Morris, and Russ Cox.
@@ -43,7 +40,7 @@ BUILDING AND RUNNING XV6
To build xv6 on an x86 ELF machine (like Linux or FreeBSD), run "make".
On non-x86 or non-ELF machines (like OS X, even on x86), you will
need to install a cross-compiler gcc suite capable of producing x86 ELF
-binaries. See http://pdos.csail.mit.edu/6.828/2014/tools.html.
+binaries. See http://pdos.csail.mit.edu/6.828/2016/tools.html.
Then run "make TOOLPREFIX=i386-jos-elf-".
To run xv6, install the QEMU PC simulators. To run in QEMU, run "make qemu".
diff --git a/elf.h b/elf.h
index d16c967..7994abf 100644
--- a/elf.h
+++ b/elf.h
@@ -40,3 +40,6 @@ struct proghdr {
#define ELF_PROG_FLAG_EXEC 1
#define ELF_PROG_FLAG_WRITE 2
#define ELF_PROG_FLAG_READ 4
+
+//PAGEBREAK!
+// Blank page.
diff --git a/main.c b/main.c
index 47c36cc..731e429 100644
--- a/main.c
+++ b/main.c
@@ -113,6 +113,3 @@ pde_t entrypgdir[NPDENTRIES] = {
//PAGEBREAK!
// Blank page.
//PAGEBREAK!
-// Blank page.
-//PAGEBREAK!
-// Blank page.
diff --git a/picirq.c b/picirq.c
index ff86831..69785a7 100644
--- a/picirq.c
+++ b/picirq.c
@@ -82,3 +82,6 @@ picinit(void)
if(irqmask != 0xFFFF)
picsetmask(irqmask);
}
+
+//PAGEBREAK!
+// Blank page.