From f935203ffddec65062874fcb0e35b3008609b35b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Cayrou Date: Sun, 12 Jul 2015 22:14:06 +0200 Subject: [PATCH] Fix linux-bootstrap-1.md incorrect merging Correct merging of commit da38b6038d2026b8d8b0de5dab0bdf0a16b19610 line 253 --- Booting/linux-bootstrap-1.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Booting/linux-bootstrap-1.md b/Booting/linux-bootstrap-1.md index 42ad15d..2ccbad8 100644 --- a/Booting/linux-bootstrap-1.md +++ b/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: ```