diff options
| author | AlmuHS <almuhs@github.com> | 2019-05-13 21:21:19 +0200 |
|---|---|---|
| committer | AlmuHS <almuhs@github.com> | 2019-05-13 21:21:19 +0200 |
| commit | 1b761f3de2295fa90254904bdef4b92bd73f6bac (patch) | |
| tree | 04461e292bc59413674b59e504a5341fded0f1e5 | |
| parent | ce30d2addfb42de0b36bfdebe22ee9096d053dba (diff) | |
fix conflict
| -rw-r--r-- | i386/i386/cpuboot.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/i386/i386/cpuboot.S b/i386/i386/cpuboot.S index 03b4a470..e19e7a5c 100644 --- a/i386/i386/cpuboot.S +++ b/i386/i386/cpuboot.S @@ -100,7 +100,6 @@ _apboot: call cpu_ap_main cli - .align 0x10 gdt_descr_tmp: .short 0x8*3 - 1 |