summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2011-04-28 08:01:36 -0400
committerFrans Kaashoek <[email protected]>2011-04-28 08:01:36 -0400
commitf70ef994dce8f6948edec8c534ae21742141dd50 (patch)
treec13e5dccde945e2a634fb9865641bdc1f2256c0e
parentae603ff5e79bb7b5eea4147425752f33d29fe558 (diff)
downloadxv6-labs-f70ef994dce8f6948edec8c534ae21742141dd50.tar.gz
xv6-labs-f70ef994dce8f6948edec8c534ae21742141dd50.tar.bz2
xv6-labs-f70ef994dce8f6948edec8c534ae21742141dd50.zip
Russ's fix for panic remap
-rw-r--r--.gitignore1
-rw-r--r--data.S2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index d304828..1c182c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*~
_*
*.o
*.d
diff --git a/data.S b/data.S
index c0eb55b..8b651b4 100644
--- a/data.S
+++ b/data.S
@@ -20,7 +20,7 @@
// or to write a linker script, but this is simplest.
.data
+.align 4096
.globl data
data:
.word 1
-