diff options
| author | AlmuHS <almuhs@github.com> | 2019-05-05 17:17:46 +0200 |
|---|---|---|
| committer | AlmuHS <almuhs@github.com> | 2019-05-05 17:17:46 +0200 |
| commit | 1c0c6600257490e3cc73a7aac86f45b984531014 (patch) | |
| tree | 34ad5bca37bae6cf7137af932dd735b24307ee3c | |
| parent | 2df0c646aa188aab00f2b119574da61a94353b59 (diff) | |
| parent | f5ddb41d7cf82bc4900f29030320f488580fedbf (diff) | |
solve conflict
| -rw-r--r-- | i386/i386/cpuboot.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/i386/i386/cpuboot.S b/i386/i386/cpuboot.S index 9d40d53e..289016f4 100644 --- a/i386/i386/cpuboot.S +++ b/i386/i386/cpuboot.S @@ -117,6 +117,7 @@ _apboot: call cpu_ap_main + .align 0x10 gdt_descr_tmp: .short 0x8*3 - 1 |