summaryrefslogtreecommitdiff
path: root/trapasm.S
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2017-08-07 14:35:05 -0400
committerFrans Kaashoek <[email protected]>2017-08-07 14:35:05 -0400
commit61cb32aa9bc457a6b39c5055cbf7fdd718dab7c2 (patch)
tree74f1a818d7722264d8a0fe825760d01ea7a83a9a /trapasm.S
parent5cbccef811ce0347370723c0b931e108c306279e (diff)
parentc9fa90f7e514f27fa1ac071cd9795f3830ab6a1b (diff)
downloadxv6-labs-61cb32aa9bc457a6b39c5055cbf7fdd718dab7c2.tar.gz
xv6-labs-61cb32aa9bc457a6b39c5055cbf7fdd718dab7c2.tar.bz2
xv6-labs-61cb32aa9bc457a6b39c5055cbf7fdd718dab7c2.zip
Merge branch 'nogs'
Diffstat (limited to 'trapasm.S')
-rw-r--r--trapasm.S3
1 files changed, 0 insertions, 3 deletions
diff --git a/trapasm.S b/trapasm.S
index 787727f..2271d27 100644
--- a/trapasm.S
+++ b/trapasm.S
@@ -14,9 +14,6 @@ alltraps:
movw $(SEG_KDATA<<3), %ax
movw %ax, %ds
movw %ax, %es
- movw $(SEG_KCPU<<3), %ax
- movw %ax, %fs
- movw %ax, %gs
# Call trap(tf), where tf=%esp
pushl %esp