Jelajahi Sumber

Fix linux-bootstrap-1.md incorrect merging

Correct merging of commit da38b6038d2026b8d8b0de5dab0bdf0a16b19610 line 253
Jean-Baptiste Cayrou 9 tahun lalu
induk
melakukan
f935203ffd
1 mengubah file dengan 0 tambahan dan 4 penghapusan
  1. 0 4
      Booting/linux-bootstrap-1.md

+ 0 - 4
Booting/linux-bootstrap-1.md

@@ -252,10 +252,6 @@ Start of Kernel Setup
 
 Finally we are in the kernel. Technically kernel didn't run yet, first of all we need to setup kernel, memory manager, process manager etc. Kernel setup execution starts from [arch/x86/boot/header.S](https://github.com/torvalds/linux/blob/master/arch/x86/boot/header.S) at the [_start](https://github.com/torvalds/linux/blob/master/arch/x86/boot/header.S#L293). It is a little strange at the first look, there are many instructions before it.
 
-=======
-
-Finally we are in the kernel. Technically kernel didn't run yet, first of all we need to setup kernel, memory manager, process manager, etc. Kernel setup execution starts from [arch/x86/boot/header.S](https://github.com/torvalds/linux/blob/master/arch/x86/boot/header.S) at the [_start](https://github.com/torvalds/linux/blob/master/arch/x86/boot/header.S#L293). It is little strange at the first look, there are many instructions before it. Actually....
-
 Actually Long time ago Linux kernel had its own bootloader, but now if you run for example:
 
 ```