summaryrefslogtreecommitdiff
path: root/bootasm.S
diff options
context:
space:
mode:
authorkaashoek <kaashoek>2006-09-03 15:39:29 +0000
committerkaashoek <kaashoek>2006-09-03 15:39:29 +0000
commit7abf49d2f22af633f2fb3546f9f9fd818cef25df (patch)
treee2c8e235d2d00240a9910e26ee527ae3dee6de0f /bootasm.S
parent801affcd147606873b10db04c9fbf80dede969f6 (diff)
downloadxv6-labs-7abf49d2f22af633f2fb3546f9f9fd818cef25df.tar.gz
xv6-labs-7abf49d2f22af633f2fb3546f9f9fd818cef25df.tar.bz2
xv6-labs-7abf49d2f22af633f2fb3546f9f9fd818cef25df.zip
remove duplication
don't use the same name for two different pieces of code
Diffstat (limited to 'bootasm.S')
-rw-r--r--bootasm.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/bootasm.S b/bootasm.S
index c2a3c3e..f776b83 100644
--- a/bootasm.S
+++ b/bootasm.S
@@ -87,9 +87,9 @@ spin: jmp spin # ..but in case it does, spin
.p2align 2 # force 4 byte alignment
gdt:
- SEG_NULL # null seg
- SEG(STA_X|STA_R, 0x0, 0xffffffff) # code seg
- SEG(STA_W, 0x0, 0xffffffff) # data seg
+ SEG_NULLASM # null seg
+ SEG_ASM(STA_X|STA_R, 0x0, 0xffffffff) # code seg
+ SEG_ASM(STA_W, 0x0, 0xffffffff) # data seg
gdtdesc:
.word 0x17 # sizeof(gdt) - 1